2 files changed, 9 insertions, 23 deletions
diff --git a/tests/cross-compile/non-uniform-indexing.slang.glsl b/tests/cross-compile/non-uniform-indexing.slang.glsl
index 96abe6bac..07e8f9e38 100644
--- a/tests/cross-compile/non-uniform-indexing.slang.glsl
+++ b/tests/cross-compile/non-uniform-indexing.slang.glsl
@@ -1,10 +1,9 @@
-//TEST_IGNORE_FILE
 #version 450
-
 #extension GL_EXT_nonuniform_qualifier : require
-
+layout(row_major) uniform;
+layout(row_major) buffer;
 layout(binding = 0)
-uniform texture2D t_0[10];
+uniform texture2D  t_0[10];
 
 layout(binding = 1)
 uniform sampler s_0;
@@ -17,12 +16,7 @@ in vec3 _S2;
 
 void main()
 {
-    vec4 _S3 = texture(
-    	sampler2D(
-    		t_0[nonuniformEXT(int(_S2.z))],
-    		s_0),
-		_S2.xy);
-
-    _S1 = _S3;
+    _S1 = (texture(sampler2D(t_0[nonuniformEXT(int(_S2.z))],s_0), (_S2.xy)));
     return;
 }
+
diff --git a/tests/cross-compile/vk-texture-indexing.slang.glsl b/tests/cross-compile/vk-texture-indexing.slang.glsl
index 73513c623..7fd768465 100644
--- a/tests/cross-compile/vk-texture-indexing.slang.glsl
+++ b/tests/cross-compile/vk-texture-indexing.slang.glsl
@@ -3,31 +3,23 @@
 #extension GL_EXT_nonuniform_qualifier : require
 layout(row_major) uniform;
 layout(row_major) buffer;
-
 layout(binding = 0)
 uniform texture2D  gParams_textures_0[10];
 
-
 float fetchData_0(uvec2 coords_0, uint index_0)
 {
-    float _S1 = (texelFetch((gParams_textures_0[nonuniformEXT(index_0)]), ivec2((coords_0)), 0).x);
-
-    return _S1;
+    return (texelFetch((gParams_textures_0[nonuniformEXT(index_0)]), ivec2((coords_0)), 0).x);
 }
 
 layout(location = 0)
-out vec4 _S2;
-
+out vec4 _S1;
 
 flat layout(location = 0)
-in uvec3 _S3;
-
+in uvec3 _S2;
 
 void main()
 {
-
-    _S2 = vec4(fetchData_0(_S3.xy, _S3.z));
-
+    _S1 = vec4(fetchData_0(_S2.xy, _S2.z));
     return;
 }