Various dxc/fxc compatibility fixes. (#2863)

* Various dxc/fxc compatibility fixes.

* Cleanup.

* Fix test cases.

* Fix comments.

---------

Co-authored-by: Yong He <yhe@nvidia.com>

7 files changed, 26 insertions, 25 deletions

diff --git a/tests/cross-compile/array-of-buffers.slang.glsl b/tests/cross-compile/array-of-buffers.slang.glsl
index 4ff86f36e..62990033e 100644
--- a/tests/cross-compile/array-of-buffers.slang.glsl
+++ b/tests/cross-compile/array-of-buffers.slang.glsl
@@ -9,7 +9,7 @@ struct SLANG_ParameterGroup_C_0
 layout(binding = 0)
 layout(std140) uniform _S1
 {
-    SLANG_ParameterGroup_C_0 _data;
+    uint index_0;
 } C_0;
 struct S_0
 {
@@ -19,7 +19,7 @@ struct S_0
 layout(binding = 1)
 layout(std140) uniform _S2
 {
-    S_0 _data;
+    vec4 f_0;
 } cb_0[3];
 layout(std430, binding = 2) readonly buffer _S3 {
     S_0 _data[];
@@ -36,9 +36,9 @@ out vec4 _S6;
 
 void main()
 {
-    S_0 _S7 = ((sb1_0[C_0._data.index_0])._data[(C_0._data.index_0)]);
-    vec4 _S8 = cb_0[C_0._data.index_0]._data.f_0 + _S7.f_0;
-    uint _S9 = ((bb_0[C_0._data.index_0])._data[(int(C_0._data.index_0 * 4U))/4]);
-    _S6 = _S8 + ((sb2_0[C_0._data.index_0])._data[(C_0._data.index_0)]) + vec4(float(_S9));
+    S_0 _S7 = ((sb1_0[C_0.index_0])._data[(C_0.index_0)]);
+    vec4 _S8 = cb_0[C_0.index_0].f_0 + _S7.f_0;
+    uint _S9 = ((bb_0[C_0.index_0])._data[(int(C_0.index_0 * 4U))/4]);
+    _S6 = _S8 + ((sb2_0[C_0.index_0])._data[(C_0.index_0)]) + vec4(float(_S9));
     return;
 }
diff --git a/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl b/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl
index 0ff895179..acf0a6fe9 100644
--- a/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl
+++ b/tests/cross-compile/glsl-empty-struct-param-field.slang.glsl
@@ -11,13 +11,13 @@ struct P_0
 layout(binding = 0)
 layout(std140) uniform _S1
 {
-    P_0 _data;
+    vec4 param_0;
 } pblock_0;
 layout(location = 0)
 out vec4 _S2;
 
 void main()
 {
-    _S2 = pblock_0._data.param_0;
+    _S2 = pblock_0.param_0;
     return;
 }
\ No newline at end of file
diff --git a/tests/cross-compile/half-conversion.slang.glsl b/tests/cross-compile/half-conversion.slang.glsl
index fb51809b4..b062f67b4 100644
--- a/tests/cross-compile/half-conversion.slang.glsl
+++ b/tests/cross-compile/half-conversion.slang.glsl
@@ -9,7 +9,7 @@ struct SLANG_ParameterGroup_C_0
 layout(binding = 0)
 layout(std140) uniform _S1
 {
-    SLANG_ParameterGroup_C_0 _data;
+    uvec4 u_0;
 } C_0;
 vec4 f16tof32_0(uvec4 value_0)
 {
@@ -35,6 +35,6 @@ out vec4 _S2;
 
 void main()
 {
-    _S2 = f16tof32_0(C_0._data.u_0);
+    _S2 = f16tof32_0(C_0.u_0);
     return;
 }
diff --git a/tests/cross-compile/texture-load.slang.glsl b/tests/cross-compile/texture-load.slang.glsl
index bb4514bad..d9145cdbf 100644
--- a/tests/cross-compile/texture-load.slang.glsl
+++ b/tests/cross-compile/texture-load.slang.glsl
@@ -17,7 +17,7 @@ layout(binding = 2)
 layout(std140)
 uniform _S1
 {
-    SLANG_ParameterGroup_C_0 _data;
+    ivec2 pos_0;
 } C_0;
 
 layout(binding = 0)
@@ -30,7 +30,7 @@ uniform image2D outputTexture_0;
 layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
 void main()
 {
-    ivec3 _S2 = ivec3(C_0._data.pos_0, 0);
+    ivec3 _S2 = ivec3(C_0.pos_0, 0);
 
     vec2 tmp_0 = texelFetch(
     	inputTexture_0,
@@ -39,7 +39,7 @@ void main()
 
     imageStore(
     	outputTexture_0,
-    	ivec2(uvec2(C_0._data.pos_0)),
+    	ivec2(uvec2(C_0.pos_0)),
     	vec4(tmp_0, float(0), float(0)));
 
     return;
diff --git a/tests/cross-compile/unknown-image-format.slang.glsl b/tests/cross-compile/unknown-image-format.slang.glsl
index 5ccc30767..e541a8b17 100644
--- a/tests/cross-compile/unknown-image-format.slang.glsl
+++ b/tests/cross-compile/unknown-image-format.slang.glsl
@@ -14,7 +14,7 @@ struct SLANG_ParameterGroup_C_0
 layout(binding = 2)
 layout(std140) uniform _S1
 {
-    SLANG_ParameterGroup_C_0 _data;
+    uvec2 index_0;
 } C_0;
 
 layout(binding = 0)
@@ -44,22 +44,22 @@ out vec4 _S2;
 void main()
 {
 
-    float _S3 = (imageLoad((gNoFormat_0), ivec2((C_0._data.index_0))).x);
+    float _S3 = (imageLoad((gNoFormat_0), ivec2((C_0.index_0))).x);
     vec4 _S4 = vec4(_S3);
 
-    float _S5 = (imageLoad((gExplicitFormat_0), ivec2((C_0._data.index_0))).x);
+    float _S5 = (imageLoad((gExplicitFormat_0), ivec2((C_0.index_0))).x);
     vec4 result_0 = _S4 + _S5;
 
-    vec4 _S6 = (imageLoad((gBlock_noFormat_0), ivec2((C_0._data.index_0))));
+    vec4 _S6 = (imageLoad((gBlock_noFormat_0), ivec2((C_0.index_0))));
     vec4 result_1 = result_0 + _S6;
 
-    vec4 _S7 = (imageLoad((gBlock_explicitFormat_0), ivec2((C_0._data.index_0))));
+    vec4 _S7 = (imageLoad((gBlock_explicitFormat_0), ivec2((C_0.index_0))));
     vec4 result_2 = result_1 + _S7;
 
-    vec4 _S8 = (imageLoad((entryPointParams_noFormat_0), ivec2((C_0._data.index_0))));
+    vec4 _S8 = (imageLoad((entryPointParams_noFormat_0), ivec2((C_0.index_0))));
     vec4 result_3 = result_2 + _S8;
 
-    vec4 _S9 = (imageLoad((entryPointParams_explicitFormat_0), ivec2((C_0._data.index_0))));
+    vec4 _S9 = (imageLoad((entryPointParams_explicitFormat_0), ivec2((C_0.index_0))));
     _S2 = result_3 + _S9;
 
     return;
diff --git a/tests/cross-compile/vector-comparison.slang.glsl b/tests/cross-compile/vector-comparison.slang.glsl
index 3e6f7b9c2..f7c28203e 100644
--- a/tests/cross-compile/vector-comparison.slang.glsl
+++ b/tests/cross-compile/vector-comparison.slang.glsl
@@ -10,7 +10,8 @@ struct Param_0
 layout(binding = 0)
 layout(std140) uniform _S1
 {
-    Param_0 _data;
+    vec4 a_0;
+    vec4 b_0;
 } params_0;
 layout(location = 0)
 out vec4 _S2;
@@ -20,6 +21,6 @@ void main()
 
     const vec4 _S3 = vec4(2.0);
     const vec4 _S4 = vec4(3.0);
-    _S2 = mix(_S4, _S3, (equal(params_0._data.a_0,params_0._data.b_0))) + mix(_S4, _S3, (lessThan(params_0._data.a_0,params_0._data.b_0))) + mix(_S4, _S3, (greaterThan(params_0._data.a_0,params_0._data.b_0))) + mix(_S4, _S3, (lessThanEqual(params_0._data.a_0,params_0._data.b_0))) + mix(_S4, _S3, (greaterThanEqual(params_0._data.a_0,params_0._data.b_0))) + mix(_S4, _S3, (notEqual(params_0._data.a_0,params_0._data.b_0)));
+    _S2 = mix(_S4, _S3, (equal(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (lessThan(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (greaterThan(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (lessThanEqual(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (greaterThanEqual(params_0.a_0,params_0.b_0))) + mix(_S4, _S3, (notEqual(params_0.a_0,params_0.b_0)));
     return;
 }
diff --git a/tests/cross-compile/vk-push-constant-set.slang.glsl b/tests/cross-compile/vk-push-constant-set.slang.glsl
index 189b14caf..7a2ce4db0 100644
--- a/tests/cross-compile/vk-push-constant-set.slang.glsl
+++ b/tests/cross-compile/vk-push-constant-set.slang.glsl
@@ -9,13 +9,13 @@ struct S_0
 layout(push_constant)
 layout(std140) uniform _S1
 {
-    S_0 _data;
+    vec4 v_0;
 } x_0;
 
 layout(binding = 0, set = 0)
 layout(std140) uniform _S2
 {
-    S_0 _data;
+    vec4 v_0;
 } y_0;
 
 layout(location = 0)
@@ -23,6 +23,6 @@ out vec4 _S3;
 
 void main()
 {
-    _S3 = x_0._data.v_0 + y_0._data.v_0;
+    _S3 = x_0.v_0 + y_0.v_0;
     return;
 }