Update to latest glslang/SPIRV-Tools.

Fix various bugs along the way.

4 files changed, 17 insertions, 14 deletions

diff --git a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
index 29bc02c6..6860cfaf 100644
--- a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
+++ b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
@@ -6,7 +6,7 @@ layout(binding = 0, std430) buffer Buf
     vec4 _data[];
 } Buf_1;
 
-layout(std430) buffer Buf_count
+layout(binding = 1, std430) buffer Buf_count
 {
     int _count;
 } Buf_count_1;
diff --git a/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag b/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag
index af44e654..8c35e62e 100644
--- a/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag
+++ b/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag
@@ -14,17 +14,16 @@ int _240;
 
 void main()
 {
-    bool _246;
     uint _227;
-    int _237;
+    int _236;
     for (;;)
     {
         _227 = 0u;
-        bool _164;
+        bool _231;
+        int _237;
         for (;;)
         {
-            _164 = _227 < _11.shadowCascadesNum;
-            if (_164)
+            if (_227 < _11.shadowCascadesNum)
             {
                 mat4 _228;
                 for (;;)
@@ -44,6 +43,7 @@ void main()
                 if ((((_179 >= 0.0) && (_179 <= 1.0)) && (max(_186, _188) <= 1.0)) && (min(_186, _188) >= 0.0))
                 {
                     _237 = int(_227);
+                    _231 = true;
                     break;
                 }
                 else
@@ -57,16 +57,18 @@ void main()
             else
             {
                 _237 = _240;
+                _231 = false;
                 break;
             }
         }
-        _246 = _164 ? true : false;
-        if (_246)
+        if (_231)
         {
+            _236 = _237;
             break;
         }
+        _236 = -1;
         break;
     }
-    _entryPointOutput = _246 ? _237 : (-1);
+    _entryPointOutput = _236;
 }
 
diff --git a/reference/opt/shaders/asm/frag/temporary-phi-hoisting.asm.frag b/reference/opt/shaders/asm/frag/temporary-phi-hoisting.asm.frag
index 1ecd61d7..ade51d4a 100644
--- a/reference/opt/shaders/asm/frag/temporary-phi-hoisting.asm.frag
+++ b/reference/opt/shaders/asm/frag/temporary-phi-hoisting.asm.frag
@@ -5,7 +5,7 @@ struct MyStruct
     vec4 color;
 };
 
-layout(std140) uniform MyStruct_CB
+layout(binding = 0, std140) uniform MyStruct_CB
 {
     MyStruct g_MyStruct[4];
 } _6;
diff --git a/reference/opt/shaders/asm/frag/unreachable.asm.frag b/reference/opt/shaders/asm/frag/unreachable.asm.frag
index eb7e8a91..c8986c12 100644
--- a/reference/opt/shaders/asm/frag/unreachable.asm.frag
+++ b/reference/opt/shaders/asm/frag/unreachable.asm.frag
@@ -5,19 +5,20 @@ layout(location = 0) out vec4 FragColor;
 
 void main()
 {
-    bool _29;
+    vec4 _33;
     for (;;)
     {
-        _29 = counter == 10;
-        if (_29)
+        if (counter == 10)
         {
+            _33 = vec4(10.0);
             break;
         }
         else
         {
+            _33 = vec4(30.0);
             break;
         }
     }
-    FragColor = mix(vec4(30.0), vec4(10.0), bvec4(_29));
+    FragColor = _33;
 }