Improved SCCP, inlining and resource specialization passes, legalize `ImageSubscript` for GLSL (#2146)

3 files changed, 11 insertions, 19 deletions

diff --git a/tests/pipeline/rasterization/conservative-rasterization/inner-coverage.slang.glsl b/tests/pipeline/rasterization/conservative-rasterization/inner-coverage.slang.glsl
index 1454d493f..59fecd544 100644
--- a/tests/pipeline/rasterization/conservative-rasterization/inner-coverage.slang.glsl
+++ b/tests/pipeline/rasterization/conservative-rasterization/inner-coverage.slang.glsl
@@ -1,14 +1,14 @@
+//TEST_IGNORE_FILE:
 #version 450
-
 #extension GL_NV_conservative_raster_underestimation : require
+layout(row_major) uniform;
+layout(row_major) buffer;
 
 layout(location = 0)
 out vec4 _S1;
 
 void main()
 {
-    vec4 _S2;
-    _S2 = vec4(uint(gl_FragFullyCoveredNV));
-    _S1 = _S2;
+    _S1 = vec4(uint(gl_FragFullyCoveredNV));
     return;
 }
diff --git a/tests/pipeline/rasterization/fragment-shader-interlock.slang.glsl b/tests/pipeline/rasterization/fragment-shader-interlock.slang.glsl
index a12b9827b..1818b7789 100644
--- a/tests/pipeline/rasterization/fragment-shader-interlock.slang.glsl
+++ b/tests/pipeline/rasterization/fragment-shader-interlock.slang.glsl
@@ -2,6 +2,8 @@
 
 #version 450
 #extension GL_ARB_fragment_shader_interlock : require
+layout(row_major) uniform;
+layout(row_major) buffer;
 
 layout(rgba32f)
 layout(binding = 0)
@@ -15,13 +17,9 @@ out vec4 _S2;
 
 void main()
 {
-    vec4 _S3;
-
     beginInvocationInterlockARB();
 
-    vec4 _S4 = (imageLoad((entryPointParams_texture_0), ivec2((uvec2(_S1.xy)))));
-
-    _S3 = _S4;
+    vec4 _S3 = (imageLoad((entryPointParams_texture_0), ivec2((uvec2(_S1.xy)))));
     imageStore((entryPointParams_texture_0), ivec2((uvec2(_S1.xy))), _S3 + _S1);
 
     endInvocationInterlockARB();
diff --git a/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl b/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl
index c07e9b61c..1da5f4f8a 100644
--- a/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl
+++ b/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl
@@ -2,24 +2,18 @@
 //TEST_IGNORE_FILE:
 
 #version 450
-
 #extension GL_NV_fragment_shader_barycentric : require
+layout(row_major) uniform;
+layout(row_major) buffer;
 
 pervertexNV layout(location = 0)
-in vec4 _S1[3];
+in vec4  _S1[3];
 
 layout(location = 0)
 out vec4 _S2;
 
 void main()
 {
-    vec4 _S3;
-
-    _S3 = gl_BaryCoordNV.x * _S1[0]
-        + gl_BaryCoordNV.y * _S1[1]
-        + gl_BaryCoordNV.z * _S1[2];
-
-    _S2 = _S3;
-
+    _S2 = gl_BaryCoordNV.x * ((_S1)[(0U)]) + gl_BaryCoordNV.y * ((_S1)[(1U)]) + gl_BaryCoordNV.z * ((_S1)[(2U)]);
     return;
 }