Merge remote-tracking branch 'origin' into resource-arrays-msl

Author: cdavis5e

checkout_glslang_spirv_tools.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-GLSLANG_REV=461ea09943e0e88ea854ab9e3b42d17d728af2ad
-SPIRV_TOOLS_REV=53bc1623ecd3cc304d0d6feed8385e70c7ab30d3
+GLSLANG_REV=91ac4290bcf2cb930b4fb0981f09c00c0b6797e1
+SPIRV_TOOLS_REV=9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661
 
 if [ -d external/glslang ]; then
 	echo "Updating glslang to revision $GLSLANG_REV."

main.cpp

@@ -838,7 +838,8 @@ static int main_inner(int argc, char *argv[])
 	else
 	{
 		combined_image_samplers = !args.vulkan_semantics;
-		build_dummy_sampler = true;
+		if (!args.vulkan_semantics)
+			build_dummy_sampler = true;
 		compiler = unique_ptr<CompilerGLSL>(new CompilerGLSL(read_spirv_file(args.input)));
 	}
 

reference/opt/shaders-hlsl/asm/comp/atomic-decrement.asm.comp

@@ -11,7 +11,7 @@ void comp_main()
 {
     uint _29;
     u0_counter.InterlockedAdd(0, -1, _29);
-    u0[uint(asint(asfloat(_29))) + 0u] = uint(int(gl_GlobalInvocationID.x)).x;
+    u0[asint(asfloat(_29))] = uint(int(gl_GlobalInvocationID.x)).x;
 }
 
 [numthreads(4, 1, 1)]

reference/opt/shaders-hlsl/asm/comp/atomic-increment.asm.comp

@@ -11,7 +11,7 @@ void comp_main()
 {
     uint _29;
     u0_counter.InterlockedAdd(0, 1, _29);
-    u0[uint(asint(asfloat(_29))) + 0u] = uint(int(gl_GlobalInvocationID.x)).x;
+    u0[asint(asfloat(_29))] = uint(int(gl_GlobalInvocationID.x)).x;
 }
 
 [numthreads(4, 1, 1)]

reference/opt/shaders-hlsl/asm/vert/spec-constant-op-composite.asm.vert

@@ -17,11 +17,11 @@ struct SPIRV_Cross_Output
 
 void vert_main()
 {
-    float4 _64 = 0.0f.xxxx;
-    _64.y = float(_20);
-    float4 _68 = _64;
-    _68.z = float(_25);
-    float4 _52 = _68 + float4(_30);
+    float4 _63 = 0.0f.xxxx;
+    _63.y = float(_20);
+    float4 _66 = _63;
+    _66.z = float(_25);
+    float4 _52 = _66 + float4(_30);
     float2 _56 = _52.xy + float2(_32);
     gl_Position = float4(_56.x, _56.y, _52.z, _52.w);
     _4 = _33;

reference/opt/shaders-hlsl/comp/composite-array-initialization.comp

@@ -24,15 +24,12 @@ struct SPIRV_Cross_Input
     uint gl_LocalInvocationIndex : SV_GroupIndex;
 };
 
-static Data data[2];
-static Data data2[2];
-
 void comp_main()
 {
-    data = _25;
+    Data data[2] = _25;
     Data _28 = { X, 2.0f };
     Data _31[2] = { _28, _30 };
-    data2 = _31;
+    Data data2[2] = _31;
     if (gl_LocalInvocationIndex == 0u)
     {
         _61.Store(gl_WorkGroupID.x * 8 + 0, asuint(data[gl_LocalInvocationID.x].a + data2[gl_LocalInvocationID.x].a));

reference/opt/shaders-hlsl/frag/bvec-operations.frag

@@ -11,9 +11,11 @@ struct SPIRV_Cross_Output
     float4 FragColor : SV_Target0;
 };
 
+bool _47;
+
 void frag_main()
 {
-    bool2 _25 = bool2(value.x == 0.0f, value.y == 0.0f);
+    bool2 _25 = bool2(value.x == 0.0f, _47);
     FragColor = float4(1.0f, 0.0f, float(bool2(!_25.x, !_25.y).x), float(bool2(value.x <= float2(1.5f, 0.5f).x, value.y <= float2(1.5f, 0.5f).y).x));
 }
 

…lsl/frag/constant-buffer-array.sm51.frag …/constant-buffer-array.invalid.sm51.fragreference/opt/shaders-hlsl/frag/constant-buffer-array.sm51.frag renamed to reference/opt/shaders-hlsl/frag/constant-buffer-array.invalid.sm51.frag reference/opt/shaders-hlsl/frag/constant-buffer-array.sm51.frag renamed to reference/opt/shaders-hlsl/frag/constant-buffer-array.invalid.sm51.frag

@@ -22,14 +22,10 @@ struct SPIRV_Cross_Output
     float4 FragColor : SV_Target0;
 };
 
-static float lut[4];
-static Foo foos[2];
-
 void frag_main()
 {
-    lut = _16;
-    foos = _28;
-    FragColor = lut[_line].xxxx;
+    Foo foos[2] = _28;
+    FragColor = _16[_line].xxxx;
     FragColor += (foos[_line].a * foos[1 - _line].a).xxxx;
 }