5 files changed, 14 insertions, 21 deletions
diff --git a/tests/bindings/array-of-struct-of-resource.hlsl b/tests/bindings/array-of-struct-of-resource.hlsl
index b34e0469b..240ffed73 100644
--- a/tests/bindings/array-of-struct-of-resource.hlsl
+++ b/tests/bindings/array-of-struct-of-resource.hlsl
@@ -4,7 +4,7 @@
 // HLSL compiler would already do in the simple case (when
 // all shader parameters are actually used).
 
-float4 use(Texture2D t, SamplerState s) { return t.Sample(s, 0.0); }
+float4 use(Texture2D t, SamplerState samp) { return t.Sample(samp, 0.0); }
 
 #ifdef __SLANG__
 
diff --git a/tests/bindings/binding0.hlsl b/tests/bindings/binding0.hlsl
index 5516b0135..2ae40ead3 100644
--- a/tests/bindings/binding0.hlsl
+++ b/tests/bindings/binding0.hlsl
@@ -24,7 +24,7 @@
 #endif
 
 float4 use(float4 val) { return val; };
-float4 use(Texture2D t, SamplerState s) { return t.Sample(s, 0.0); }
+float4 use(Texture2D tex, SamplerState samp) { return tex.Sample(samp, 0.0); }
 
 Texture2D 		t R(: register(t0));
 SamplerState 	s R(: register(s0));
diff --git a/tests/cross-compile/non-uniform-indexing.slang.glsl b/tests/cross-compile/non-uniform-indexing.slang.glsl
index 83f63c70d..5ea5ed73a 100644
--- a/tests/cross-compile/non-uniform-indexing.slang.glsl
+++ b/tests/cross-compile/non-uniform-indexing.slang.glsl
@@ -17,12 +17,10 @@ in vec3 _S2;
 
 void main()
 {
-    vec3 _S3 = _S2;
+    int _S3 = nonuniformEXT(int(_S2.z));
 
-    int _S4 = nonuniformEXT(int(_S3.z));
+    vec4 _S4 = texture(sampler2D(t_0[_S3],s_0), _S2.xy);
 
-    vec4 _S5 = texture(sampler2D(t_0[_S4],s_0), _S3.xy);
-
-    _S1 = _S5;
+    _S1 = _S4;
     return;
 }
diff --git a/tests/vkray/anyhit.slang.glsl b/tests/vkray/anyhit.slang.glsl
index 07789cdbd..622080399 100644
--- a/tests/vkray/anyhit.slang.glsl
+++ b/tests/vkray/anyhit.slang.glsl
@@ -33,13 +33,11 @@ rayPayloadInNV ShadowRay_0 _S3;
 
 void main()
 {
-    SphereHitAttributes_0 _S4 = _S2;
-
     if(bool(gParams_0._data.mode_0))
     {
         float val_0 = textureLod(
             sampler2D(gParams_alphaMap_0, gParams_sampler_0),
-            _S4.normal_0.xy,
+            _S2.normal_0.xy,
             float(0)).x;
 
 
diff --git a/tests/vkray/closesthit.slang.glsl b/tests/vkray/closesthit.slang.glsl
index 79fd3afbe..46c5ea636 100644
--- a/tests/vkray/closesthit.slang.glsl
+++ b/tests/vkray/closesthit.slang.glsl
@@ -6,15 +6,14 @@
 #define tmp_colors          _S2
 #define tmp_hitattrs        _S3
 #define tmp_payload         _S4
-#define tmp_localattrs      _S5
-#define tmp_customidx       _S6
-#define tmp_instanceid      _S7
-#define tmp_add_0           _S8
-#define tmp_primid          _S9
-#define tmp_add_1           _S10
-#define tmp_hitkind         _S11
-#define tmp_hitt            _S12
-#define tmp_tmin            _S13
+#define tmp_customidx       _S5
+#define tmp_instanceid      _S6
+#define tmp_add_0           _S7
+#define tmp_primid          _S8
+#define tmp_add_1           _S9
+#define tmp_hitkind         _S10
+#define tmp_hitt            _S11
+#define tmp_tmin            _S12
 
 struct SLANG_ParameterGroup_ShaderRecord_0
 {
@@ -49,8 +48,6 @@ rayPayloadInNV ReflectionRay_0 tmp_payload;
 
 void main()
 {
-    BuiltInTriangleIntersectionAttributes_0 tmp_localattrs = tmp_hitattrs;
-
     uint tmp_customidx = gl_InstanceCustomIndexNV;
     uint tmp_instanceid = gl_InstanceID;