From 1c6c08d41f6b794b9eb3582f24b167a5143b25b0 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Mon, 18 Oct 2021 22:01:07 +0200
Subject: [PATCH] Fixed ray tracing callable shader sample HLSL shaders

---
 .../hlsl/raytracingcallable/callable1.rcall       |   7 ++++---
 .../hlsl/raytracingcallable/callable1.rcall.spv   | Bin 0 -> 660 bytes
 .../hlsl/raytracingcallable/callable2.rcall       |   2 +-
 .../hlsl/raytracingcallable/callable2.rcall.spv   | Bin 0 -> 388 bytes
 .../hlsl/raytracingcallable/callable3.rcall       |   7 ++++---
 .../hlsl/raytracingcallable/callable3.rcall.spv   | Bin 0 -> 564 bytes
 6 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 data/shaders/hlsl/raytracingcallable/callable1.rcall.spv
 create mode 100644 data/shaders/hlsl/raytracingcallable/callable2.rcall.spv
 create mode 100644 data/shaders/hlsl/raytracingcallable/callable3.rcall.spv

diff --git a/data/shaders/hlsl/raytracingcallable/callable1.rcall b/data/shaders/hlsl/raytracingcallable/callable1.rcall
index 40fd7c71..5a40044d 100644
--- a/data/shaders/hlsl/raytracingcallable/callable1.rcall
+++ b/data/shaders/hlsl/raytracingcallable/callable1.rcall
@@ -2,13 +2,14 @@
 
 struct CallData
 {
-    vec3 outColor;
+    float3 outColor;
 };
 
 [shader("callable")]
 void main(inout CallData data)
 {
     // Generate a checker board pattern
-	float2 pos = float2(DispatchRaysIndex() / 8);
-	data.outColor = float3(mod(pos.x + mod(pos.y, 2.0), 2.0));
+	float2 pos = float2(DispatchRaysIndex().x / 8, DispatchRaysIndex().y / 8);
+	float col = (pos.x + (pos.y % 2.0)) % 2.0;
+	data.outColor = float3(col, col, col);
 }
\ No newline at end of file
diff --git a/data/shaders/hlsl/raytracingcallable/callable1.rcall.spv b/data/shaders/hlsl/raytracingcallable/callable1.rcall.spv
new file mode 100644
index 0000000000000000000000000000000000000000..79fe2d1927b655cecf246f6c926b339e297ac1ac
GIT binary patch
literal 660
zcmYk3&r3p45QRrgEi27T?H6IRY#%`sfk8nVD`+c^f)GqYENB&NTJ?9;y8ot4(D%s`
zypMTv=G-%9-n}oE-77{u6A|Uu=IyFRHr}ccr6|Nr=eB!!aorsyuifz|x$6xcQ068&
zyDCwPueAvAW6~SAktI~*c=F^Ih&<06xSjO-XURAL;$E0=;^FhSJ?sxhVwHN_r#kCd
z|8r{n7m06X*QuS;B3%1vT>#G$4b(+)i*QdY&pK^VF9789+~Mta%C$fx@((lQ)H>5y
zYTaKVX9)QkU%gD;Ww%TgAEh3iM;~i@?6>a#H+5o{eZTlr$j9lt6|nj%w9e+&gq-Um
z<yOJ+p81JB&r>7hr+ti{^f_zVR|m___BE*GKk?S5NyvF;?<uzq*5AFUZUZc@u7jg@
axJk%Qqr<m(ms{!H2`BSztpB)$L*gIT$R;cR

literal 0
HcmV?d00001

diff --git a/data/shaders/hlsl/raytracingcallable/callable2.rcall b/data/shaders/hlsl/raytracingcallable/callable2.rcall
index 498dfe05..86789325 100644
--- a/data/shaders/hlsl/raytracingcallable/callable2.rcall
+++ b/data/shaders/hlsl/raytracingcallable/callable2.rcall
@@ -2,7 +2,7 @@
 
 struct CallData
 {
-    vec3 outColor;
+    float3 outColor;
 };
 
 [shader("callable")]
diff --git a/data/shaders/hlsl/raytracingcallable/callable2.rcall.spv b/data/shaders/hlsl/raytracingcallable/callable2.rcall.spv
new file mode 100644
index 0000000000000000000000000000000000000000..fb4c4f39b2f69e26b837d00533a9e2bffe7bdddc
GIT binary patch
literal 388
zcmYk1O>4qH5Qe9TiC<Nbirz%=SkF=r^k5Hym(qgQuqcR-8VIq_Q~T?@_uqICeBKzL
zy9_h$&hyUh`rfE)!GoDK*|*g;&wkowH4E+IZ5^$a?@{W$qbzls{b2{^=b&6Im{Z40
z^{3k()bI$O9gx2e0b7oRi{n?9IZ9k%F~ux7W{V_FQk@4@%Kh7dlm0)ui>m}TAfBmI
z>mIGU4s-Q8@6jz&i_!gK?v$<&@`zLJ(^X%+0d$r8$Defe#A|BgA*xPRJuMjhQ`{IW
b_L0!+2~)-C-CFXUnbRQ8AmtN#fp{UVGBF(R

literal 0
HcmV?d00001

diff --git a/data/shaders/hlsl/raytracingcallable/callable3.rcall b/data/shaders/hlsl/raytracingcallable/callable3.rcall
index 18c97cac..3fe4fd85 100644
--- a/data/shaders/hlsl/raytracingcallable/callable3.rcall
+++ b/data/shaders/hlsl/raytracingcallable/callable3.rcall
@@ -2,13 +2,14 @@
 
 struct CallData
 {
-    vec3 outColor;
+    float3 outColor;
 };
 
 [shader("callable")]
 void main(inout CallData data)
 {
     // Generate a checker board pattern
-	float2 pos = float2(DispatchRaysIndex() / 8);
-	data.outColor = float3(mod(pos.y, 2.0));
+	float2 pos = float2(DispatchRaysIndex().x / 8, DispatchRaysIndex().y / 8);
+	float col = pos.y % 2.0;
+	data.outColor = float3(col, col, col);
 }
\ No newline at end of file
diff --git a/data/shaders/hlsl/raytracingcallable/callable3.rcall.spv b/data/shaders/hlsl/raytracingcallable/callable3.rcall.spv
new file mode 100644
index 0000000000000000000000000000000000000000..417942748a5bc9db76c384584145321f2a5497c2
GIT binary patch
literal 564
zcmYk3K}!N*5Qax>wX8HV^%h3Q?h!~47!-7|g08X@gkTzCL8oq=`dxMI-*gFjp5;6A
zEwl5^JMYYVvs)?e*CH!LL?e2<J*_CmTPva-)wmhmjxR5+$BX=Ryj<jWli35xN};o=
z8MXM_i4Z^LlbMM!rlP`=;a?y!o)z#gpH9#6We%i!wcy0_=jCudoiD^H?Qx%U#{c`D
z6Wf0s`(k#7*g1X7bCBXHcoplSuHpNbIk7zFv`4%KkhAA5Z|^DB2i5W4%#c&-OlPSz
zzkx4d@@;OtiQgmJz>5c|hx^#a*c$7tJEWUBvB$a}`ZV#!Y2FrC{S{hg^J_xRn)k$Q
tC*GZ(sB@n-CjWuPnDGVY?jydvJ9ZLpP8(6{u3gOB36s6M@h=mPus>fdB6<J-

literal 0
HcmV?d00001