From c2b4c5838431e12abb6f233c459d3d6a717aad18 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 21 May 2019 14:44:09 -0400 Subject: Hotfix/improve glsl semantic conversion (#965) * Specify glsl semantic format - such that conversions are possible from hlsl sematics. * Comment improvements. Give appropriate type in glsl for sv_tessfactor. Note that sv_tessfactor is not functional though. * Work in progress for comparison of types. * * Fix type comparison issues around the hash. * Fix tests whos output changed with use of isTypeEqual --- .../func-resource-param-array.slang.glsl | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'tests/cross-compile/func-resource-param-array.slang.glsl') diff --git a/tests/cross-compile/func-resource-param-array.slang.glsl b/tests/cross-compile/func-resource-param-array.slang.glsl index d7f9c17bc..e9d1b5a97 100644 --- a/tests/cross-compile/func-resource-param-array.slang.glsl +++ b/tests/cross-compile/func-resource-param-array.slang.glsl @@ -26,14 +26,12 @@ #define g_c_i _S10 #define g_c_j _S11 -#define tid _S12 +#define tmp_f_a_ii _S12 +#define tmp_f_a_jj _S13 -#define tmp_f_a_ii _S13 -#define tmp_f_a_jj _S14 - -#define tmp_f_b _S15 -#define tmp_g_b _S16 -#define tmp_g_c _S17 +#define tmp_f_b _S14 +#define tmp_g_b _S15 +#define tmp_g_c _S16 layout(std430, binding = 0) buffer a_block { int _data[]; @@ -71,11 +69,9 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { - uvec3 tid = uvec3(gl_GlobalInvocationID); - - uint ii = tid.x; - uint jj = tid.y; - uint kk = tid.z; + uint ii = gl_GlobalInvocationID.x; + uint jj = gl_GlobalInvocationID.y; + uint kk = gl_GlobalInvocationID.z; int tmp_f_a_ii = f_a(ii); -- cgit v1.2.3