diff --git a/checkout_glslang_spirv_tools.sh b/checkout_glslang_spirv_tools.sh
index 6819d570..2205e720 100755
--- a/checkout_glslang_spirv_tools.sh
+++ b/checkout_glslang_spirv_tools.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-GLSLANG_REV=7d65f09b83112c1ec9e29313cb9913ed2b850aa0
-SPIRV_TOOLS_REV=67f4838659f475d618c120e13d1a196d7e00ba4b
-SPIRV_HEADERS_REV=2ad0492fb00919d99500f1da74abf5ad3c870e4e
+GLSLANG_REV=2e0f0a0517e4251ac8e0d6fd46e92af33fcb800d0
+SPIRV_TOOLS_REV=95df4c9643cd440187d652c24d463c1c7dd99a91
+SPIRV_HEADERS_REV=c0df742ec0b8178ad58c68cff3437ad4b6a06e26
 
 if [ -z $PROTOCOL ]; then
 	PROTOCOL=git
diff --git a/reference/opt/shaders-hlsl/asm/comp/control-flow-hints.asm.comp b/reference/opt/shaders-hlsl/asm/comp/control-flow-hints.asm.comp
index 142ef5ef..ea79d002 100644
--- a/reference/opt/shaders-hlsl/asm/comp/control-flow-hints.asm.comp
+++ b/reference/opt/shaders-hlsl/asm/comp/control-flow-hints.asm.comp
@@ -4,17 +4,17 @@ RWByteAddressBuffer foo : register(u1);
 void comp_main()
 {
     [unroll]
-    for (int _135 = 0; _135 < 16; )
+    for (int _136 = 0; _136 < 16; )
     {
-        bar.Store4(_135 * 16 + 0, asuint(asfloat(foo.Load4(_135 * 16 + 0))));
-        _135++;
+        bar.Store4(_136 * 16 + 0, asuint(asfloat(foo.Load4(_136 * 16 + 0))));
+        _136++;
         continue;
     }
     [loop]
-    for (int _136 = 0; _136 < 16; )
+    for (int _137 = 0; _137 < 16; )
     {
-        bar.Store4((15 - _136) * 16 + 0, asuint(asfloat(foo.Load4(_136 * 16 + 0))));
-        _136++;
+        bar.Store4((15 - _137) * 16 + 0, asuint(asfloat(foo.Load4(_137 * 16 + 0))));
+        _137++;
         continue;
     }
     [branch]
diff --git a/reference/opt/shaders-hlsl/asm/frag/line-directive.line.asm.frag b/reference/opt/shaders-hlsl/asm/frag/line-directive.line.asm.frag
index 93bb69eb..bb5ff558 100644
--- a/reference/opt/shaders-hlsl/asm/frag/line-directive.line.asm.frag
+++ b/reference/opt/shaders-hlsl/asm/frag/line-directive.line.asm.frag
@@ -29,13 +29,13 @@ void frag_main()
 #line 16 "test.frag"
         FragColor = 4.0f;
     }
-    for (int _126 = 0; float(_126) < (40.0f + vColor); )
+    for (int _127 = 0; float(_127) < (40.0f + vColor); )
     {
 #line 21 "test.frag"
         FragColor += 0.20000000298023223876953125f;
 #line 22 "test.frag"
         FragColor += 0.300000011920928955078125f;
-        _126 += (int(vColor) + 5);
+        _127 += (int(vColor) + 5);
         continue;
     }
     switch (int(vColor))
diff --git a/reference/opt/shaders-hlsl/comp/rwbuffer-matrix.comp b/reference/opt/shaders-hlsl/comp/rwbuffer-matrix.comp
index a6621c97..09cbd2f4 100644
--- a/reference/opt/shaders-hlsl/comp/rwbuffer-matrix.comp
+++ b/reference/opt/shaders-hlsl/comp/rwbuffer-matrix.comp
@@ -10,57 +10,57 @@ cbuffer UBO : register(b1)
 
 void comp_main()
 {
-    float4x4 _257 = asfloat(uint4x4(_28.Load(64), _28.Load(80), _28.Load(96), _28.Load(112), _28.Load(68), _28.Load(84), _28.Load(100), _28.Load(116), _28.Load(72), _28.Load(88), _28.Load(104), _28.Load(120), _28.Load(76), _28.Load(92), _28.Load(108), _28.Load(124)));
-    _28.Store4(0, asuint(_257[0]));
-    _28.Store4(16, asuint(_257[1]));
-    _28.Store4(32, asuint(_257[2]));
-    _28.Store4(48, asuint(_257[3]));
-    float2x2 _260 = asfloat(uint2x2(_28.Load(144), _28.Load(152), _28.Load(148), _28.Load(156)));
-    _28.Store2(128, asuint(_260[0]));
-    _28.Store2(136, asuint(_260[1]));
-    float2x3 _263 = asfloat(uint2x3(_28.Load(192), _28.Load(200), _28.Load(208), _28.Load(196), _28.Load(204), _28.Load(212)));
-    _28.Store3(160, asuint(_263[0]));
-    _28.Store3(176, asuint(_263[1]));
-    float3x2 _266 = asfloat(uint3x2(_28.Load(240), _28.Load(256), _28.Load(244), _28.Load(260), _28.Load(248), _28.Load(264)));
-    _28.Store2(216, asuint(_266[0]));
-    _28.Store2(224, asuint(_266[1]));
-    _28.Store2(232, asuint(_266[2]));
-    float4x4 _269 = asfloat(uint4x4(_28.Load4(0), _28.Load4(16), _28.Load4(32), _28.Load4(48)));
-    _28.Store(64, asuint(_269[0].x));
-    _28.Store(68, asuint(_269[1].x));
-    _28.Store(72, asuint(_269[2].x));
-    _28.Store(76, asuint(_269[3].x));
-    _28.Store(80, asuint(_269[0].y));
-    _28.Store(84, asuint(_269[1].y));
-    _28.Store(88, asuint(_269[2].y));
-    _28.Store(92, asuint(_269[3].y));
-    _28.Store(96, asuint(_269[0].z));
-    _28.Store(100, asuint(_269[1].z));
-    _28.Store(104, asuint(_269[2].z));
-    _28.Store(108, asuint(_269[3].z));
-    _28.Store(112, asuint(_269[0].w));
-    _28.Store(116, asuint(_269[1].w));
-    _28.Store(120, asuint(_269[2].w));
-    _28.Store(124, asuint(_269[3].w));
-    float2x2 _272 = asfloat(uint2x2(_28.Load2(128), _28.Load2(136)));
-    _28.Store(144, asuint(_272[0].x));
-    _28.Store(148, asuint(_272[1].x));
-    _28.Store(152, asuint(_272[0].y));
-    _28.Store(156, asuint(_272[1].y));
-    float2x3 _275 = asfloat(uint2x3(_28.Load3(160), _28.Load3(176)));
-    _28.Store(192, asuint(_275[0].x));
-    _28.Store(196, asuint(_275[1].x));
-    _28.Store(200, asuint(_275[0].y));
-    _28.Store(204, asuint(_275[1].y));
-    _28.Store(208, asuint(_275[0].z));
-    _28.Store(212, asuint(_275[1].z));
-    float3x2 _278 = asfloat(uint3x2(_28.Load2(216), _28.Load2(224), _28.Load2(232)));
-    _28.Store(240, asuint(_278[0].x));
-    _28.Store(244, asuint(_278[1].x));
-    _28.Store(248, asuint(_278[2].x));
-    _28.Store(256, asuint(_278[0].y));
-    _28.Store(260, asuint(_278[1].y));
-    _28.Store(264, asuint(_278[2].y));
+    float4x4 _258 = asfloat(uint4x4(_28.Load(64), _28.Load(80), _28.Load(96), _28.Load(112), _28.Load(68), _28.Load(84), _28.Load(100), _28.Load(116), _28.Load(72), _28.Load(88), _28.Load(104), _28.Load(120), _28.Load(76), _28.Load(92), _28.Load(108), _28.Load(124)));
+    _28.Store4(0, asuint(_258[0]));
+    _28.Store4(16, asuint(_258[1]));
+    _28.Store4(32, asuint(_258[2]));
+    _28.Store4(48, asuint(_258[3]));
+    float2x2 _261 = asfloat(uint2x2(_28.Load(144), _28.Load(152), _28.Load(148), _28.Load(156)));
+    _28.Store2(128, asuint(_261[0]));
+    _28.Store2(136, asuint(_261[1]));
+    float2x3 _264 = asfloat(uint2x3(_28.Load(192), _28.Load(200), _28.Load(208), _28.Load(196), _28.Load(204), _28.Load(212)));
+    _28.Store3(160, asuint(_264[0]));
+    _28.Store3(176, asuint(_264[1]));
+    float3x2 _267 = asfloat(uint3x2(_28.Load(240), _28.Load(256), _28.Load(244), _28.Load(260), _28.Load(248), _28.Load(264)));
+    _28.Store2(216, asuint(_267[0]));
+    _28.Store2(224, asuint(_267[1]));
+    _28.Store2(232, asuint(_267[2]));
+    float4x4 _271 = asfloat(uint4x4(_28.Load4(0), _28.Load4(16), _28.Load4(32), _28.Load4(48)));
+    _28.Store(64, asuint(_271[0].x));
+    _28.Store(68, asuint(_271[1].x));
+    _28.Store(72, asuint(_271[2].x));
+    _28.Store(76, asuint(_271[3].x));
+    _28.Store(80, asuint(_271[0].y));
+    _28.Store(84, asuint(_271[1].y));
+    _28.Store(88, asuint(_271[2].y));
+    _28.Store(92, asuint(_271[3].y));
+    _28.Store(96, asuint(_271[0].z));
+    _28.Store(100, asuint(_271[1].z));
+    _28.Store(104, asuint(_271[2].z));
+    _28.Store(108, asuint(_271[3].z));
+    _28.Store(112, asuint(_271[0].w));
+    _28.Store(116, asuint(_271[1].w));
+    _28.Store(120, asuint(_271[2].w));
+    _28.Store(124, asuint(_271[3].w));
+    float2x2 _274 = asfloat(uint2x2(_28.Load2(128), _28.Load2(136)));
+    _28.Store(144, asuint(_274[0].x));
+    _28.Store(148, asuint(_274[1].x));
+    _28.Store(152, asuint(_274[0].y));
+    _28.Store(156, asuint(_274[1].y));
+    float2x3 _277 = asfloat(uint2x3(_28.Load3(160), _28.Load3(176)));
+    _28.Store(192, asuint(_277[0].x));
+    _28.Store(196, asuint(_277[1].x));
+    _28.Store(200, asuint(_277[0].y));
+    _28.Store(204, asuint(_277[1].y));
+    _28.Store(208, asuint(_277[0].z));
+    _28.Store(212, asuint(_277[1].z));
+    float3x2 _280 = asfloat(uint3x2(_28.Load2(216), _28.Load2(224), _28.Load2(232)));
+    _28.Store(240, asuint(_280[0].x));
+    _28.Store(244, asuint(_280[1].x));
+    _28.Store(248, asuint(_280[2].x));
+    _28.Store(256, asuint(_280[0].y));
+    _28.Store(260, asuint(_280[1].y));
+    _28.Store(264, asuint(_280[2].y));
     _28.Store(_68_index0 * 4 + _68_index1 * 16 + 64, asuint(1.0f));
     _28.Store(_68_index0 * 4 + _68_index1 * 8 + 144, asuint(2.0f));
     _28.Store(_68_index0 * 4 + _68_index1 * 8 + 192, asuint(3.0f));
diff --git a/reference/opt/shaders-msl/asm/comp/variable-pointers-2.asm.comp b/reference/opt/shaders-msl/asm/comp/variable-pointers-2.asm.comp
index a87e341a..a276b400 100644
--- a/reference/opt/shaders-msl/asm/comp/variable-pointers-2.asm.comp
+++ b/reference/opt/shaders-msl/asm/comp/variable-pointers-2.asm.comp
@@ -17,15 +17,15 @@ struct bar
 
 kernel void main0(device foo& buf [[buffer(0)]], constant bar& cb [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]], uint3 gl_LocalInvocationID [[thread_position_in_threadgroup]])
 {
-    bool _70 = cb.d != 0;
-    device foo* _71 = _70 ? &buf : nullptr;
-    device foo* _67 = _71;
-    device foo* _45 = _71;
-    thread uint3* _77 = _70 ? &gl_GlobalInvocationID : &gl_LocalInvocationID;
-    thread uint3* _73 = _77;
+    bool _71 = cb.d != 0;
+    device foo* _72 = _71 ? &buf : nullptr;
+    device foo* _67 = _72;
+    device foo* _45 = _72;
+    thread uint3* _79 = _71 ? &gl_GlobalInvocationID : &gl_LocalInvocationID;
+    thread uint3* _74 = _79;
     device int* _52;
     device int* _55;
-    _52 = &_71->a[0u];
+    _52 = &_72->a[0u];
     _55 = &buf.a[0u];
     int _57;
     int _58;
@@ -35,7 +35,7 @@ kernel void main0(device foo& buf [[buffer(0)]], constant bar& cb [[buffer(1)]],
         _58 = *_55;
         if (_57 != _58)
         {
-            int _66 = (_57 + _58) + int((*_77).x);
+            int _66 = (_57 + _58) + int((*_79).x);
             *_52 = _66;
             *_55 = _66;
             _52 = &_52[1u];
diff --git a/reference/opt/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp b/reference/opt/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp
index b4e03a29..e1861730 100644
--- a/reference/opt/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp
+++ b/reference/opt/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp
@@ -15,11 +15,11 @@ struct bar
 
 kernel void main0(device foo& x [[buffer(0)]], device bar& y [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]])
 {
-    device int* _46 = (gl_GlobalInvocationID.x != 0u) ? &x.a : &y.b;
-    device int* _40 = _46;
-    device int* _33 = _46;
+    device int* _47 = (gl_GlobalInvocationID.x != 0u) ? &x.a : &y.b;
+    device int* _40 = _47;
+    device int* _33 = _47;
     int _37 = x.a;
-    *_46 = 0;
+    *_47 = 0;
     y.b = _37 + _37;
 }
 
diff --git a/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp b/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp
index 641f108e..36600038 100644
--- a/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp
+++ b/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp
@@ -13,14 +13,14 @@ constant uint3 gl_WorkGroupSize [[maybe_unused]] = uint3(16u, 16u, 1u);
 kernel void main0(constant cb1_struct& cb0_1 [[buffer(0)]], texture2d<float, access::write> u0 [[texture(0)]], uint3 gl_LocalInvocationID [[thread_position_in_threadgroup]])
 {
     int2 _46 = int2(u0.get_width(), u0.get_height()) >> int2(uint2(4u));
-    int _97;
-    _97 = 0;
-    for (; _97 < _46.y; _97++)
+    int _98;
+    _98 = 0;
+    for (; _98 < _46.y; _98++)
     {
-        for (int _98 = 0; _98 < _46.x; )
+        for (int _99 = 0; _99 < _46.x; )
         {
-            u0.write(cb0_1._m0[0].xxxx, uint2(((_46 * int3(gl_LocalInvocationID).xy) + int2(_97, _98))));
-            _98++;
+            u0.write(cb0_1._m0[0].xxxx, uint2(((_46 * int3(gl_LocalInvocationID).xy) + int2(_98, _99))));
+            _99++;
             continue;
         }
     }
diff --git a/reference/opt/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag b/reference/opt/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag
index 649f9f6f..09f8ed8c 100644
--- a/reference/opt/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag
+++ b/reference/opt/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag
@@ -23,8 +23,8 @@ struct main0_out
 fragment main0_out main0(constant buf& _11 [[buffer(0)]], float4 gl_FragCoord [[position]])
 {
     main0_out out = {};
-    int _67 = int(gl_FragCoord.x) % 16;
-    out._entryPointOutput = float4(dot(float3(_11.results[_67].a), _11.bar.xyz), _11.results[_67].b, 0.0, 0.0);
+    int _68 = int(gl_FragCoord.x) % 16;
+    out._entryPointOutput = float4(dot(float3(_11.results[_68].a), _11.bar.xyz), _11.results[_68].b, 0.0, 0.0);
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/asm/frag/line-directive.line.asm.frag b/reference/opt/shaders-msl/asm/frag/line-directive.line.asm.frag
index 0d9666d6..f70254a8 100644
--- a/reference/opt/shaders-msl/asm/frag/line-directive.line.asm.frag
+++ b/reference/opt/shaders-msl/asm/frag/line-directive.line.asm.frag
@@ -32,13 +32,13 @@ fragment main0_out main0(main0_in in [[stage_in]])
 #line 16 "test.frag"
         out.FragColor = 4.0;
     }
-    for (int _126 = 0; float(_126) < (40.0 + in.vColor); )
+    for (int _127 = 0; float(_127) < (40.0 + in.vColor); )
     {
 #line 21 "test.frag"
         out.FragColor += 0.20000000298023223876953125;
 #line 22 "test.frag"
         out.FragColor += 0.300000011920928955078125;
-        _126 += (int(in.vColor) + 5);
+        _127 += (int(in.vColor) + 5);
         continue;
     }
     switch (int(in.vColor))
diff --git a/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag b/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
index f8dc4201..d00acd7e 100644
--- a/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
+++ b/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
@@ -88,10 +88,10 @@ fragment main0_out main0(main0_in in [[stage_in]], constant spvDescriptorSetBuff
     constant uint* spvDescriptorSet0_uSampler0Swzl = &spvDescriptorSet0.spvSwizzleConstants[0];
     constant uint& uSampler1Swzl = spvSwizzleConstants[0];
     out.FragColor = spvTextureSwizzle(spvDescriptorSet0.uSampler0[2].sample(spvDescriptorSet0.uSampler0Smplr[2], in.vUV), spvDescriptorSet0_uSampler0Swzl[2]);
-    float4 _71 = spvTextureSwizzle(uSampler1.sample(uSampler1Smplr, in.vUV), uSampler1Swzl);
-    out.FragColor += _71;
+    float4 _73 = spvTextureSwizzle(uSampler1.sample(uSampler1Smplr, in.vUV), uSampler1Swzl);
+    out.FragColor += _73;
     out.FragColor += spvTextureSwizzle(spvDescriptorSet0.uSampler0[1].sample(spvDescriptorSet0.uSampler0Smplr[1], in.vUV), spvDescriptorSet0_uSampler0Swzl[1]);
-    out.FragColor += _71;
+    out.FragColor += _73;
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/frag/helper-invocation.msl21.frag b/reference/opt/shaders-msl/frag/helper-invocation.msl21.frag
index bacf6fa1..a833fa08 100644
--- a/reference/opt/shaders-msl/frag/helper-invocation.msl21.frag
+++ b/reference/opt/shaders-msl/frag/helper-invocation.msl21.frag
@@ -17,16 +17,16 @@ fragment main0_out main0(main0_in in [[stage_in]], texture2d<float> uSampler [[t
 {
     main0_out out = {};
     bool gl_HelperInvocation = simd_is_helper_thread();
-    float4 _51;
+    float4 _52;
     if (!gl_HelperInvocation)
     {
-        _51 = uSampler.sample(uSamplerSmplr, in.vUV, level(0.0));
+        _52 = uSampler.sample(uSamplerSmplr, in.vUV, level(0.0));
     }
     else
     {
-        _51 = float4(1.0);
+        _52 = float4(1.0);
     }
-    out.FragColor = _51;
+    out.FragColor = _52;
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/frag/image-query-lod.msl22.frag b/reference/opt/shaders-msl/frag/image-query-lod.msl22.frag
index a2b8262e..de7a60cc 100644
--- a/reference/opt/shaders-msl/frag/image-query-lod.msl22.frag
+++ b/reference/opt/shaders-msl/frag/image-query-lod.msl22.frag
@@ -41,30 +41,30 @@ fragment main0_out main0(main0_in in [[stage_in]], texture2d<float> uSampler2D [
     _111.x = uTextureCube.calculate_clamped_lod(uSampler, in.vUV);
     _111.y = uTextureCube.calculate_unclamped_lod(uSampler, in.vUV);
     out.FragColor += _111;
-    float2 _118;
-    _118.x = uSampler2D.calculate_clamped_lod(uSampler2DSmplr, in.vUV.xy);
-    _118.y = uSampler2D.calculate_unclamped_lod(uSampler2DSmplr, in.vUV.xy);
-    out.FragColor += _118;
-    float2 _123;
-    _123.x = uSampler3D.calculate_clamped_lod(uSampler3DSmplr, in.vUV);
-    _123.y = uSampler3D.calculate_unclamped_lod(uSampler3DSmplr, in.vUV);
-    out.FragColor += _123;
-    float2 _128;
-    _128.x = uSamplerCube.calculate_clamped_lod(uSamplerCubeSmplr, in.vUV);
-    _128.y = uSamplerCube.calculate_unclamped_lod(uSamplerCubeSmplr, in.vUV);
-    out.FragColor += _128;
-    float2 _136;
-    _136.x = uTexture2D.calculate_clamped_lod(uSampler, in.vUV.xy);
-    _136.y = uTexture2D.calculate_unclamped_lod(uSampler, in.vUV.xy);
-    out.FragColor += _136;
-    float2 _143;
-    _143.x = uTexture3D.calculate_clamped_lod(uSampler, in.vUV);
-    _143.y = uTexture3D.calculate_unclamped_lod(uSampler, in.vUV);
-    out.FragColor += _143;
-    float2 _150;
-    _150.x = uTextureCube.calculate_clamped_lod(uSampler, in.vUV);
-    _150.y = uTextureCube.calculate_unclamped_lod(uSampler, in.vUV);
-    out.FragColor += _150;
+    float2 _119;
+    _119.x = uSampler2D.calculate_clamped_lod(uSampler2DSmplr, in.vUV.xy);
+    _119.y = uSampler2D.calculate_unclamped_lod(uSampler2DSmplr, in.vUV.xy);
+    out.FragColor += _119;
+    float2 _124;
+    _124.x = uSampler3D.calculate_clamped_lod(uSampler3DSmplr, in.vUV);
+    _124.y = uSampler3D.calculate_unclamped_lod(uSampler3DSmplr, in.vUV);
+    out.FragColor += _124;
+    float2 _129;
+    _129.x = uSamplerCube.calculate_clamped_lod(uSamplerCubeSmplr, in.vUV);
+    _129.y = uSamplerCube.calculate_unclamped_lod(uSamplerCubeSmplr, in.vUV);
+    out.FragColor += _129;
+    float2 _137;
+    _137.x = uTexture2D.calculate_clamped_lod(uSampler, in.vUV.xy);
+    _137.y = uTexture2D.calculate_unclamped_lod(uSampler, in.vUV.xy);
+    out.FragColor += _137;
+    float2 _144;
+    _144.x = uTexture3D.calculate_clamped_lod(uSampler, in.vUV);
+    _144.y = uTexture3D.calculate_unclamped_lod(uSampler, in.vUV);
+    out.FragColor += _144;
+    float2 _151;
+    _151.x = uTextureCube.calculate_clamped_lod(uSampler, in.vUV);
+    _151.y = uTextureCube.calculate_unclamped_lod(uSampler, in.vUV);
+    out.FragColor += _151;
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/frag/shader-arithmetic-8bit.frag b/reference/opt/shaders-msl/frag/shader-arithmetic-8bit.frag
index 325e300b..1e32b2d6 100644
--- a/reference/opt/shaders-msl/frag/shader-arithmetic-8bit.frag
+++ b/reference/opt/shaders-msl/frag/shader-arithmetic-8bit.frag
@@ -37,56 +37,56 @@ fragment main0_out main0(main0_in in [[stage_in]], device SSBO& ssbo [[buffer(0)
     main0_out out = {};
     short _196 = short(10);
     int _197 = 20;
-    char2 _201 = as_type<char2>(short(10));
-    char2 _198 = _201;
+    char2 _202 = as_type<char2>(short(10));
+    char2 _198 = _202;
     char4 _199 = as_type<char4>(20);
-    _196 = as_type<short>(_201);
+    _196 = as_type<short>(_202);
     _197 = as_type<int>(_199);
     ssbo.i8[0] = _199.x;
     ssbo.i8[1] = _199.y;
     ssbo.i8[2] = _199.z;
     ssbo.i8[3] = _199.w;
-    ushort _220 = ushort(10);
-    uint _221 = 20u;
-    uchar2 _225 = as_type<uchar2>(ushort(10));
-    uchar2 _222 = _225;
-    uchar4 _223 = as_type<uchar4>(20u);
-    _220 = as_type<ushort>(_225);
-    _221 = as_type<uint>(_223);
-    ssbo.u8[0] = _223.x;
-    ssbo.u8[1] = _223.y;
-    ssbo.u8[2] = _223.z;
-    ssbo.u8[3] = _223.w;
-    char4 _246 = char4(in.vColor);
-    char4 _244 = _246;
-    char4 _251 = _246 + char4(registers.i8);
-    _244 = _251;
-    char4 _254 = _251 + char4(-40);
-    _244 = _254;
-    char4 _256 = _254 + char4(-50);
-    _244 = _256;
-    char4 _258 = _256 + char4(char(10), char(20), char(30), char(40));
-    _244 = _258;
-    char4 _263 = _258 + char4(ssbo.i8[4]);
-    _244 = _263;
-    char4 _268 = _263 + char4(ubo.i8);
-    _244 = _268;
-    out.FragColorInt = int4(_268);
-    uchar4 _274 = uchar4(_246);
-    uchar4 _271 = _274;
-    uchar4 _279 = _274 + uchar4(registers.u8);
-    _271 = _279;
-    uchar4 _282 = _279 + uchar4(216);
-    _271 = _282;
-    uchar4 _284 = _282 + uchar4(206);
-    _271 = _284;
-    uchar4 _286 = _284 + uchar4(uchar(10), uchar(20), uchar(30), uchar(40));
-    _271 = _286;
-    uchar4 _291 = _286 + uchar4(ssbo.u8[4]);
-    _271 = _291;
-    uchar4 _296 = _291 + uchar4(ubo.u8);
-    _271 = _296;
-    out.FragColorUint = uint4(_296);
+    ushort _221 = ushort(10);
+    uint _222 = 20u;
+    uchar2 _227 = as_type<uchar2>(ushort(10));
+    uchar2 _223 = _227;
+    uchar4 _224 = as_type<uchar4>(20u);
+    _221 = as_type<ushort>(_227);
+    _222 = as_type<uint>(_224);
+    ssbo.u8[0] = _224.x;
+    ssbo.u8[1] = _224.y;
+    ssbo.u8[2] = _224.z;
+    ssbo.u8[3] = _224.w;
+    char4 _249 = char4(in.vColor);
+    char4 _246 = _249;
+    char4 _254 = _249 + char4(registers.i8);
+    _246 = _254;
+    char4 _257 = _254 + char4(-40);
+    _246 = _257;
+    char4 _259 = _257 + char4(-50);
+    _246 = _259;
+    char4 _261 = _259 + char4(char(10), char(20), char(30), char(40));
+    _246 = _261;
+    char4 _266 = _261 + char4(ssbo.i8[4]);
+    _246 = _266;
+    char4 _271 = _266 + char4(ubo.i8);
+    _246 = _271;
+    out.FragColorInt = int4(_271);
+    uchar4 _278 = uchar4(_249);
+    uchar4 _274 = _278;
+    uchar4 _283 = _278 + uchar4(registers.u8);
+    _274 = _283;
+    uchar4 _286 = _283 + uchar4(216);
+    _274 = _286;
+    uchar4 _288 = _286 + uchar4(206);
+    _274 = _288;
+    uchar4 _290 = _288 + uchar4(uchar(10), uchar(20), uchar(30), uchar(40));
+    _274 = _290;
+    uchar4 _295 = _290 + uchar4(ssbo.u8[4]);
+    _274 = _295;
+    uchar4 _300 = _295 + uchar4(ubo.u8);
+    _274 = _300;
+    out.FragColorUint = uint4(_300);
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/tesc/water_tess.tesc b/reference/opt/shaders-msl/tesc/water_tess.tesc
index 9a75f05b..18484190 100644
--- a/reference/opt/shaders-msl/tesc/water_tess.tesc
+++ b/reference/opt/shaders-msl/tesc/water_tess.tesc
@@ -32,23 +32,23 @@ kernel void main0(main0_in in [[stage_in]], constant UBO& _41 [[buffer(0)]], uin
     threadgroup_barrier(mem_flags::mem_threadgroup);
     if (gl_InvocationID >= 1)
         return;
-    float2 _430 = (gl_in[0].vPatchPosBase - float2(10.0)) * _41.uScale.xy;
-    float2 _440 = ((gl_in[0].vPatchPosBase + _41.uPatchSize) + float2(10.0)) * _41.uScale.xy;
-    float3 _445 = float3(_430.x, -10.0, _430.y);
-    float3 _450 = float3(_440.x, 10.0, _440.y);
-    float4 _466 = float4((_445 + _450) * 0.5, 1.0);
-    float3 _513 = float3(length(_450 - _445) * (-0.5));
-    bool _515 = any(float3(dot(_41.uFrustum[0], _466), dot(_41.uFrustum[1], _466), dot(_41.uFrustum[2], _466)) <= _513);
-    bool _525;
-    if (!_515)
+    float2 _431 = (gl_in[0].vPatchPosBase - float2(10.0)) * _41.uScale.xy;
+    float2 _441 = ((gl_in[0].vPatchPosBase + _41.uPatchSize) + float2(10.0)) * _41.uScale.xy;
+    float3 _446 = float3(_431.x, -10.0, _431.y);
+    float3 _451 = float3(_441.x, 10.0, _441.y);
+    float4 _467 = float4((_446 + _451) * 0.5, 1.0);
+    float3 _514 = float3(length(_451 - _446) * (-0.5));
+    bool _516 = any(float3(dot(_41.uFrustum[0], _467), dot(_41.uFrustum[1], _467), dot(_41.uFrustum[2], _467)) <= _514);
+    bool _526;
+    if (!_516)
     {
-        _525 = any(float3(dot(_41.uFrustum[3], _466), dot(_41.uFrustum[4], _466), dot(_41.uFrustum[5], _466)) <= _513);
+        _526 = any(float3(dot(_41.uFrustum[3], _467), dot(_41.uFrustum[4], _467), dot(_41.uFrustum[5], _467)) <= _514);
     }
     else
     {
-        _525 = _515;
+        _526 = _516;
     }
-    if (!(!_525))
+    if (!(!_526))
     {
         spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[0] = half(-1.0);
         spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[1] = half(-1.0);
@@ -60,34 +60,34 @@ kernel void main0(main0_in in [[stage_in]], constant UBO& _41 [[buffer(0)]], uin
     else
     {
         patchOut.vOutPatchPosBase = gl_in[0].vPatchPosBase;
-        float2 _678 = (gl_in[0].vPatchPosBase + (float2(-0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float2 _706 = (gl_in[0].vPatchPosBase + (float2(0.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _725 = fast::clamp(log2((length(_41.uCamPos - float3(_706.x, 0.0, _706.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        float2 _734 = (gl_in[0].vPatchPosBase + (float2(1.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float2 _762 = (gl_in[0].vPatchPosBase + (float2(-0.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _781 = fast::clamp(log2((length(_41.uCamPos - float3(_762.x, 0.0, _762.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        float2 _790 = (gl_in[0].vPatchPosBase + (float2(0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _809 = fast::clamp(log2((length(_41.uCamPos - float3(_790.x, 0.0, _790.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        float2 _818 = (gl_in[0].vPatchPosBase + (float2(1.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _837 = fast::clamp(log2((length(_41.uCamPos - float3(_818.x, 0.0, _818.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        float2 _846 = (gl_in[0].vPatchPosBase + (float2(-0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float2 _874 = (gl_in[0].vPatchPosBase + (float2(0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _893 = fast::clamp(log2((length(_41.uCamPos - float3(_874.x, 0.0, _874.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        float2 _902 = (gl_in[0].vPatchPosBase + (float2(1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _612 = dot(float4(_781, _809, fast::clamp(log2((length(_41.uCamPos - float3(_846.x, 0.0, _846.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _893), float4(0.25));
-        float _618 = dot(float4(fast::clamp(log2((length(_41.uCamPos - float3(_678.x, 0.0, _678.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _725, _781, _809), float4(0.25));
-        float _624 = dot(float4(_725, fast::clamp(log2((length(_41.uCamPos - float3(_734.x, 0.0, _734.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _809, _837), float4(0.25));
-        float _630 = dot(float4(_809, _837, _893, fast::clamp(log2((length(_41.uCamPos - float3(_902.x, 0.0, _902.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x)), float4(0.25));
-        float4 _631 = float4(_612, _618, _624, _630);
-        patchOut.vPatchLods = _631;
-        float4 _928 = exp2(-fast::min(_631, _631.yzwx)) * _41.uMaxTessLevel.y;
-        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[0] = half(_928.x);
-        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[1] = half(_928.y);
-        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[2] = half(_928.z);
-        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[3] = half(_928.w);
-        float _935 = _41.uMaxTessLevel.y * exp2(-fast::min(fast::min(fast::min(_612, _618), fast::min(_624, _630)), _809));
-        spvTessLevel[gl_PrimitiveID].insideTessellationFactor[0] = half(_935);
-        spvTessLevel[gl_PrimitiveID].insideTessellationFactor[1] = half(_935);
+        float2 _681 = (gl_in[0].vPatchPosBase + (float2(-0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _710 = (gl_in[0].vPatchPosBase + (float2(0.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _729 = fast::clamp(log2((length(_41.uCamPos - float3(_710.x, 0.0, _710.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        float2 _739 = (gl_in[0].vPatchPosBase + (float2(1.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _768 = (gl_in[0].vPatchPosBase + (float2(-0.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _787 = fast::clamp(log2((length(_41.uCamPos - float3(_768.x, 0.0, _768.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        float2 _797 = (gl_in[0].vPatchPosBase + (float2(0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _816 = fast::clamp(log2((length(_41.uCamPos - float3(_797.x, 0.0, _797.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        float2 _826 = (gl_in[0].vPatchPosBase + (float2(1.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _845 = fast::clamp(log2((length(_41.uCamPos - float3(_826.x, 0.0, _826.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        float2 _855 = (gl_in[0].vPatchPosBase + (float2(-0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _884 = (gl_in[0].vPatchPosBase + (float2(0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _903 = fast::clamp(log2((length(_41.uCamPos - float3(_884.x, 0.0, _884.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        float2 _913 = (gl_in[0].vPatchPosBase + (float2(1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _614 = dot(float4(_787, _816, fast::clamp(log2((length(_41.uCamPos - float3(_855.x, 0.0, _855.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _903), float4(0.25));
+        float _620 = dot(float4(fast::clamp(log2((length(_41.uCamPos - float3(_681.x, 0.0, _681.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _729, _787, _816), float4(0.25));
+        float _626 = dot(float4(_729, fast::clamp(log2((length(_41.uCamPos - float3(_739.x, 0.0, _739.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _816, _845), float4(0.25));
+        float _632 = dot(float4(_816, _845, _903, fast::clamp(log2((length(_41.uCamPos - float3(_913.x, 0.0, _913.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x)), float4(0.25));
+        float4 _633 = float4(_614, _620, _626, _632);
+        patchOut.vPatchLods = _633;
+        float4 _940 = exp2(-fast::min(_633, _633.yzwx)) * _41.uMaxTessLevel.y;
+        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[0] = half(_940.x);
+        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[1] = half(_940.y);
+        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[2] = half(_940.z);
+        spvTessLevel[gl_PrimitiveID].edgeTessellationFactor[3] = half(_940.w);
+        float _948 = _41.uMaxTessLevel.y * exp2(-fast::min(fast::min(fast::min(_614, _620), fast::min(_626, _632)), _816));
+        spvTessLevel[gl_PrimitiveID].insideTessellationFactor[0] = half(_948);
+        spvTessLevel[gl_PrimitiveID].insideTessellationFactor[1] = half(_948);
     }
 }
 
diff --git a/reference/opt/shaders-msl/tese/input-types.tese b/reference/opt/shaders-msl/tese/input-types.tese
index 75f917e2..0ce04ca3 100644
--- a/reference/opt/shaders-msl/tese/input-types.tese
+++ b/reference/opt/shaders-msl/tese/input-types.tese
@@ -65,12 +65,12 @@ struct main0_patchIn
     out.gl_Position += patchIn.vColors;
     out.gl_Position += vFoo.a;
     out.gl_Position += vFoo.b;
-    Foo _203 = Foo{ patchIn.gl_in[0].Foo_a, patchIn.gl_in[0].Foo_b };
-    out.gl_Position += _203.a;
-    out.gl_Position += _203.b;
-    Foo _217 = Foo{ patchIn.gl_in[1].Foo_a, patchIn.gl_in[1].Foo_b };
-    out.gl_Position += _217.a;
-    out.gl_Position += _217.b;
+    Foo _204 = Foo{ patchIn.gl_in[0].Foo_a, patchIn.gl_in[0].Foo_b };
+    out.gl_Position += _204.a;
+    out.gl_Position += _204.b;
+    Foo _218 = Foo{ patchIn.gl_in[1].Foo_a, patchIn.gl_in[1].Foo_b };
+    out.gl_Position += _218.a;
+    out.gl_Position += _218.b;
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/tese/water_tess.tese b/reference/opt/shaders-msl/tese/water_tess.tese
index dd93e413..df539ebb 100644
--- a/reference/opt/shaders-msl/tese/water_tess.tese
+++ b/reference/opt/shaders-msl/tese/water_tess.tese
@@ -29,16 +29,16 @@ struct main0_patchIn
 [[ patch(quad, 0) ]] vertex main0_out main0(main0_patchIn patchIn [[stage_in]], constant UBO& _31 [[buffer(0)]], texture2d<float> uHeightmapDisplacement [[texture(0)]], sampler uHeightmapDisplacementSmplr [[sampler(0)]], float2 gl_TessCoord [[position_in_patch]])
 {
     main0_out out = {};
-    float2 _201 = patchIn.vOutPatchPosBase + (float3(gl_TessCoord, 0).xy * _31.uPatchSize);
-    float2 _214 = mix(patchIn.vPatchLods.yx, patchIn.vPatchLods.zw, float2(float3(gl_TessCoord, 0).x));
-    float _221 = mix(_214.x, _214.y, float3(gl_TessCoord, 0).y);
-    float _223 = floor(_221);
-    float2 _125 = _201 * _31.uInvHeightmapSize;
-    float2 _141 = _31.uInvHeightmapSize * exp2(_223);
+    float2 _202 = patchIn.vOutPatchPosBase + (float3(gl_TessCoord, 0).xy * _31.uPatchSize);
+    float2 _216 = mix(patchIn.vPatchLods.yx, patchIn.vPatchLods.zw, float2(float3(gl_TessCoord, 0).x));
+    float _223 = mix(_216.x, _216.y, float3(gl_TessCoord, 0).y);
+    float _225 = floor(_223);
+    float2 _125 = _202 * _31.uInvHeightmapSize;
+    float2 _141 = _31.uInvHeightmapSize * exp2(_225);
     out.vGradNormalTex = float4(_125 + (_31.uInvHeightmapSize * 0.5), _125 * _31.uScale.zw);
-    float3 _253 = mix(uHeightmapDisplacement.sample(uHeightmapDisplacementSmplr, (_125 + (_141 * 0.5)), level(_223)).xyz, uHeightmapDisplacement.sample(uHeightmapDisplacementSmplr, (_125 + (_141 * 1.0)), level(_223 + 1.0)).xyz, float3(_221 - _223));
-    float2 _171 = (_201 * _31.uScale.xy) + _253.yz;
-    out.vWorld = float3(_171.x, _253.x, _171.y);
+    float3 _256 = mix(uHeightmapDisplacement.sample(uHeightmapDisplacementSmplr, (_125 + (_141 * 0.5)), level(_225)).xyz, uHeightmapDisplacement.sample(uHeightmapDisplacementSmplr, (_125 + (_141 * 1.0)), level(_225 + 1.0)).xyz, float3(_223 - _225));
+    float2 _171 = (_202 * _31.uScale.xy) + _256.yz;
+    out.vWorld = float3(_171.x, _256.x, _171.y);
     out.gl_Position = _31.uMVP * float4(out.vWorld, 1.0);
     return out;
 }
diff --git a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
index 6860cfaf..d30cddaf 100644
--- a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
+++ b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
@@ -13,7 +13,7 @@ layout(binding = 1, std430) buffer Buf_count
 
 void main()
 {
-    int _32 = atomicAdd(Buf_count_1._count, 1);
-    Buf_1._data[_32] = vec4(1.0);
+    int _33 = atomicAdd(Buf_count_1._count, 1);
+    Buf_1._data[_33] = vec4(1.0);
 }
 
diff --git a/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp b/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp
index ff83de34..7d43b6f5 100644
--- a/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp
+++ b/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp
@@ -18,18 +18,18 @@ layout(binding = 0, std430) buffer MyThirdBuffer
 
 void main()
 {
-    uint _105 = MyFirstBuffer_1._data[0];
-    uint _109 = MyFirstBuffer_1._data[1];
-    uint _113 = MyFirstBuffer_1._data[2];
-    uint _117 = MyFirstBuffer_1._data[3];
-    uint _122 = MySecondBuffer_1._data[1];
-    uint _126 = MySecondBuffer_1._data[2];
-    uint _130 = MySecondBuffer_1._data[3];
-    uint _134 = MySecondBuffer_1._data[4];
-    uvec4 _140 = uvec4(_105, _109, _113, _117) + uvec4(_122, _126, _130, _134);
-    MyThirdBuffer_1._data[0] = _140.x;
-    MyThirdBuffer_1._data[1] = _140.y;
-    MyThirdBuffer_1._data[2] = _140.z;
-    MyThirdBuffer_1._data[3] = _140.w;
+    uint _106 = MyFirstBuffer_1._data[0];
+    uint _110 = MyFirstBuffer_1._data[1];
+    uint _114 = MyFirstBuffer_1._data[2];
+    uint _118 = MyFirstBuffer_1._data[3];
+    uint _123 = MySecondBuffer_1._data[1];
+    uint _127 = MySecondBuffer_1._data[2];
+    uint _131 = MySecondBuffer_1._data[3];
+    uint _135 = MySecondBuffer_1._data[4];
+    uvec4 _141 = uvec4(_106, _110, _114, _118) + uvec4(_123, _127, _131, _135);
+    MyThirdBuffer_1._data[0] = _141.x;
+    MyThirdBuffer_1._data[1] = _141.y;
+    MyThirdBuffer_1._data[2] = _141.z;
+    MyThirdBuffer_1._data[3] = _141.w;
 }
 
diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag
index 452fd6fb..350142d4 100644
--- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag
+++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag
@@ -7,7 +7,7 @@ layout(location = 0) out vec4 _entryPointOutput;
 
 void main()
 {
-    ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
-    _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
+    ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
+    _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
 }
 
diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk
index 55e2c2da..b898b01b 100644
--- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk
+++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk
@@ -8,7 +8,7 @@ layout(location = 0) out vec4 _entryPointOutput;
 
 void main()
 {
-    ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
-    _entryPointOutput = ((texelFetch(SampledImage, _152, 0) + texelFetch(SampledImage, _152, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
+    ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
+    _entryPointOutput = ((texelFetch(SampledImage, _154, 0) + texelFetch(SampledImage, _154, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
 }
 
diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag
index 452fd6fb..350142d4 100644
--- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag
+++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag
@@ -7,7 +7,7 @@ layout(location = 0) out vec4 _entryPointOutput;
 
 void main()
 {
-    ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
-    _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
+    ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
+    _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
 }
 
diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk
index 23acab0b..21797b4c 100644
--- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk
+++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk
@@ -8,7 +8,7 @@ layout(location = 0) out vec4 _entryPointOutput;
 
 void main()
 {
-    ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
-    _entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _152, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _152, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
+    ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy;
+    _entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _154, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _154, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
 }
 
diff --git a/reference/opt/shaders/asm/frag/line-directive.line.asm.frag b/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
index 74eb62bb..55408080 100644
--- a/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
+++ b/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
@@ -22,13 +22,13 @@ void main()
 #line 16 "test.frag"
         FragColor = 4.0;
     }
-    for (int _126 = 0; float(_126) < (40.0 + vColor); )
+    for (int _127 = 0; float(_127) < (40.0 + vColor); )
     {
 #line 21 "test.frag"
         FragColor += 0.20000000298023223876953125;
 #line 22 "test.frag"
         FragColor += 0.300000011920928955078125;
-        _126 += (int(vColor) + 5);
+        _127 += (int(vColor) + 5);
         continue;
     }
     switch (int(vColor))
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 f3028a47..a0c47556 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
@@ -10,60 +10,60 @@ layout(binding = 0, std140) uniform Foo
 layout(location = 0) in vec3 fragWorld;
 layout(location = 0) out int _entryPointOutput;
 
-int _228;
+int _231;
 
 void main()
 {
-    int _225;
+    int _228;
     switch (0u)
     {
         default:
         {
-            bool _222;
-            int _226;
-            uint _219 = 0u;
+            bool _225;
+            int _229;
+            uint _222 = 0u;
             for (;;)
             {
-                if (_219 < _11.shadowCascadesNum)
+                if (_222 < _11.shadowCascadesNum)
                 {
-                    mat4 _220;
+                    mat4 _223;
                     switch (0u)
                     {
                         default:
                         {
                             if (_11.test == 0)
                             {
-                                _220 = mat4(vec4(0.5, 0.0, 0.0, 0.0), vec4(0.0, 0.5, 0.0, 0.0), vec4(0.0, 0.0, 0.5, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
+                                _223 = mat4(vec4(0.5, 0.0, 0.0, 0.0), vec4(0.0, 0.5, 0.0, 0.0), vec4(0.0, 0.0, 0.5, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
                                 break;
                             }
-                            _220 = mat4(vec4(1.0, 0.0, 0.0, 0.0), vec4(0.0, 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
+                            _223 = mat4(vec4(1.0, 0.0, 0.0, 0.0), vec4(0.0, 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
                             break;
                         }
                     }
-                    vec4 _171 = (_220 * _11.lightVP[_219]) * vec4(fragWorld, 1.0);
-                    float _173 = _171.z;
-                    float _180 = _171.x;
-                    float _182 = _171.y;
-                    if ((((_173 >= 0.0) && (_173 <= 1.0)) && (max(_180, _182) <= 1.0)) && (min(_180, _182) >= 0.0))
+                    vec4 _170 = (_223 * _11.lightVP[_222]) * vec4(fragWorld, 1.0);
+                    float _172 = _170.z;
+                    float _179 = _170.x;
+                    float _181 = _170.y;
+                    if ((((_172 >= 0.0) && (_172 <= 1.0)) && (max(_179, _181) <= 1.0)) && (min(_179, _181) >= 0.0))
                     {
-                        _226 = int(_219);
-                        _222 = true;
+                        _229 = int(_222);
+                        _225 = true;
                         break;
                     }
-                    _219++;
+                    _222++;
                     continue;
                 }
                 else
                 {
-                    _226 = _228;
-                    _222 = false;
+                    _229 = _231;
+                    _225 = false;
                     break;
                 }
             }
-            _225 = -1;
+            _228 = -1;
             break;
         }
     }
-    _entryPointOutput = _225;
+    _entryPointOutput = _228;
 }
 
diff --git a/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom b/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom
index d1f8963f..0b1f5ca7 100644
--- a/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom
+++ b/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom
@@ -10,11 +10,11 @@ void main()
         _35_unrolled[i] = gl_in[i].gl_Position;
     }
     vec4 param[3] = _35_unrolled;
-    for (int _73 = 0; _73 < 3; )
+    for (int _74 = 0; _74 < 3; )
     {
-        gl_Position = param[_73];
+        gl_Position = param[_74];
         EmitVertex();
-        _73++;
+        _74++;
         continue;
     }
     EndPrimitive();
diff --git a/reference/opt/shaders/comp/cfg.comp b/reference/opt/shaders/comp/cfg.comp
index bc1a4178..af207378 100644
--- a/reference/opt/shaders/comp/cfg.comp
+++ b/reference/opt/shaders/comp/cfg.comp
@@ -6,7 +6,7 @@ layout(binding = 0, std430) buffer SSBO
     float data;
 } _11;
 
-float _187;
+float _188;
 
 void main()
 {
@@ -31,14 +31,14 @@ void main()
             break;
         }
     }
-    float _184;
-    _184 = _187;
-    for (int _183 = 0; _183 < 20; )
+    float _185;
+    _185 = _188;
+    for (int _184 = 0; _184 < 20; )
     {
-        _184 += 10.0;
-        _183++;
+        _185 += 10.0;
+        _184++;
         continue;
     }
-    _11.data = _184;
+    _11.data = _185;
 }
 
diff --git a/reference/opt/shaders/comp/generate_height.comp b/reference/opt/shaders/comp/generate_height.comp
index feb8d41c..bfd78300 100644
--- a/reference/opt/shaders/comp/generate_height.comp
+++ b/reference/opt/shaders/comp/generate_height.comp
@@ -18,39 +18,39 @@ layout(binding = 1, std430) writeonly buffer HeightmapFFT
 
 void main()
 {
-    uvec2 _264 = uvec2(64u, 1u) * gl_NumWorkGroups.xy;
-    uvec2 _269 = _264 - gl_GlobalInvocationID.xy;
-    bvec2 _271 = equal(gl_GlobalInvocationID.xy, uvec2(0u));
-    uint _454;
-    if (_271.x)
+    uvec2 _265 = uvec2(64u, 1u) * gl_NumWorkGroups.xy;
+    uvec2 _270 = _265 - gl_GlobalInvocationID.xy;
+    bvec2 _272 = equal(gl_GlobalInvocationID.xy, uvec2(0u));
+    uint _460;
+    if (_272.x)
     {
-        _454 = 0u;
+        _460 = 0u;
     }
     else
     {
-        _454 = _269.x;
+        _460 = _270.x;
     }
-    uint _455;
-    if (_271.y)
+    uint _461;
+    if (_272.y)
     {
-        _455 = 0u;
+        _461 = 0u;
     }
     else
     {
-        _455 = _269.y;
+        _461 = _270.y;
     }
-    uint _276 = _264.x;
-    uint _280 = (gl_GlobalInvocationID.y * _276) + gl_GlobalInvocationID.x;
-    uint _290 = (_455 * _276) + _454;
-    vec2 _297 = vec2(gl_GlobalInvocationID.xy);
-    vec2 _299 = vec2(_264);
-    float _309 = sqrt(9.81000041961669921875 * length(_166.uModTime.xy * mix(_297, _297 - _299, greaterThan(_297, _299 * 0.5)))) * _166.uModTime.z;
-    vec2 _316 = vec2(cos(_309), sin(_309));
-    vec2 _387 = _316.xx;
-    vec2 _392 = _316.yy;
-    vec2 _395 = _392 * _137.distribution[_280].yx;
-    vec2 _421 = _392 * _137.distribution[_290].yx;
-    vec2 _429 = (_137.distribution[_290] * _387) + vec2(-_421.x, _421.y);
-    _225.heights[_280] = packHalf2x16(((_137.distribution[_280] * _387) + vec2(-_395.x, _395.y)) + vec2(_429.x, -_429.y));
+    uint _277 = _265.x;
+    uint _281 = (gl_GlobalInvocationID.y * _277) + gl_GlobalInvocationID.x;
+    uint _291 = (_461 * _277) + _460;
+    vec2 _298 = vec2(gl_GlobalInvocationID.xy);
+    vec2 _300 = vec2(_265);
+    float _310 = sqrt(9.81000041961669921875 * length(_166.uModTime.xy * mix(_298, _298 - _300, greaterThan(_298, _300 * 0.5)))) * _166.uModTime.z;
+    vec2 _317 = vec2(cos(_310), sin(_310));
+    vec2 _391 = _317.xx;
+    vec2 _396 = _317.yy;
+    vec2 _399 = _396 * _137.distribution[_281].yx;
+    vec2 _426 = _396 * _137.distribution[_291].yx;
+    vec2 _434 = (_137.distribution[_291] * _391) + vec2(-_426.x, _426.y);
+    _225.heights[_281] = packHalf2x16(((_137.distribution[_281] * _391) + vec2(-_399.x, _399.y)) + vec2(_434.x, -_434.y));
 }
 
diff --git a/reference/opt/shaders/frag/helper-invocation.frag b/reference/opt/shaders/frag/helper-invocation.frag
index 759a21bd..0c44f72a 100644
--- a/reference/opt/shaders/frag/helper-invocation.frag
+++ b/reference/opt/shaders/frag/helper-invocation.frag
@@ -9,15 +9,15 @@ layout(location = 0) out vec4 FragColor;
 
 void main()
 {
-    vec4 _51;
+    vec4 _52;
     if (!gl_HelperInvocation)
     {
-        _51 = textureLod(uSampler, vUV, 0.0);
+        _52 = textureLod(uSampler, vUV, 0.0);
     }
     else
     {
-        _51 = vec4(1.0);
+        _52 = vec4(1.0);
     }
-    FragColor = _51;
+    FragColor = _52;
 }
 
diff --git a/reference/opt/shaders/frag/image-load-store-uint-coord.asm.frag b/reference/opt/shaders/frag/image-load-store-uint-coord.asm.frag
index 5dfb4d00..f25b4b73 100644
--- a/reference/opt/shaders/frag/image-load-store-uint-coord.asm.frag
+++ b/reference/opt/shaders/frag/image-load-store-uint-coord.asm.frag
@@ -10,8 +10,8 @@ layout(location = 0) out vec4 _entryPointOutput;
 void main()
 {
     imageStore(RWIm, ivec2(uvec2(10u)), vec4(10.0, 0.5, 8.0, 2.0));
-    vec4 _69 = imageLoad(RWIm, ivec2(uvec2(30u)));
-    imageStore(RWBuf, int(80u), _69);
-    _entryPointOutput = (_69 + texelFetch(ROIm, ivec2(uvec2(50u, 60u)), 0)) + texelFetch(ROBuf, int(80u));
+    vec4 _70 = imageLoad(RWIm, ivec2(uvec2(30u)));
+    imageStore(RWBuf, int(80u), _70);
+    _entryPointOutput = (_70 + texelFetch(ROIm, ivec2(uvec2(50u, 60u)), 0)) + texelFetch(ROBuf, int(80u));
 }
 
diff --git a/reference/opt/shaders/tesc/water_tess.tesc b/reference/opt/shaders/tesc/water_tess.tesc
index eb3e84d5..79da68be 100644
--- a/reference/opt/shaders/tesc/water_tess.tesc
+++ b/reference/opt/shaders/tesc/water_tess.tesc
@@ -18,23 +18,23 @@ layout(location = 0) in vec2 vPatchPosBase[];
 
 void main()
 {
-    vec2 _430 = (vPatchPosBase[0] - vec2(10.0)) * _41.uScale.xy;
-    vec2 _440 = ((vPatchPosBase[0] + _41.uPatchSize) + vec2(10.0)) * _41.uScale.xy;
-    vec3 _445 = vec3(_430.x, -10.0, _430.y);
-    vec3 _450 = vec3(_440.x, 10.0, _440.y);
-    vec4 _466 = vec4((_445 + _450) * 0.5, 1.0);
-    vec3 _513 = vec3(length(_450 - _445) * (-0.5));
-    bool _515 = any(lessThanEqual(vec3(dot(_41.uFrustum[0], _466), dot(_41.uFrustum[1], _466), dot(_41.uFrustum[2], _466)), _513));
-    bool _525;
-    if (!_515)
+    vec2 _431 = (vPatchPosBase[0] - vec2(10.0)) * _41.uScale.xy;
+    vec2 _441 = ((vPatchPosBase[0] + _41.uPatchSize) + vec2(10.0)) * _41.uScale.xy;
+    vec3 _446 = vec3(_431.x, -10.0, _431.y);
+    vec3 _451 = vec3(_441.x, 10.0, _441.y);
+    vec4 _467 = vec4((_446 + _451) * 0.5, 1.0);
+    vec3 _514 = vec3(length(_451 - _446) * (-0.5));
+    bool _516 = any(lessThanEqual(vec3(dot(_41.uFrustum[0], _467), dot(_41.uFrustum[1], _467), dot(_41.uFrustum[2], _467)), _514));
+    bool _526;
+    if (!_516)
     {
-        _525 = any(lessThanEqual(vec3(dot(_41.uFrustum[3], _466), dot(_41.uFrustum[4], _466), dot(_41.uFrustum[5], _466)), _513));
+        _526 = any(lessThanEqual(vec3(dot(_41.uFrustum[3], _467), dot(_41.uFrustum[4], _467), dot(_41.uFrustum[5], _467)), _514));
     }
     else
     {
-        _525 = _515;
+        _526 = _516;
     }
-    if (!(!_525))
+    if (!(!_526))
     {
         gl_TessLevelOuter[0] = -1.0;
         gl_TessLevelOuter[1] = -1.0;
@@ -46,34 +46,34 @@ void main()
     else
     {
         vOutPatchPosBase = vPatchPosBase[0];
-        vec2 _678 = (vPatchPosBase[0] + (vec2(-0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        vec2 _706 = (vPatchPosBase[0] + (vec2(0.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _725 = clamp(log2((length(_41.uCamPos - vec3(_706.x, 0.0, _706.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        vec2 _734 = (vPatchPosBase[0] + (vec2(1.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        vec2 _762 = (vPatchPosBase[0] + (vec2(-0.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _781 = clamp(log2((length(_41.uCamPos - vec3(_762.x, 0.0, _762.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        vec2 _790 = (vPatchPosBase[0] + (vec2(0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _809 = clamp(log2((length(_41.uCamPos - vec3(_790.x, 0.0, _790.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        vec2 _818 = (vPatchPosBase[0] + (vec2(1.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _837 = clamp(log2((length(_41.uCamPos - vec3(_818.x, 0.0, _818.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        vec2 _846 = (vPatchPosBase[0] + (vec2(-0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        vec2 _874 = (vPatchPosBase[0] + (vec2(0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _893 = clamp(log2((length(_41.uCamPos - vec3(_874.x, 0.0, _874.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
-        vec2 _902 = (vPatchPosBase[0] + (vec2(1.5) * _41.uPatchSize)) * _41.uScale.xy;
-        float _612 = dot(vec4(_781, _809, clamp(log2((length(_41.uCamPos - vec3(_846.x, 0.0, _846.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _893), vec4(0.25));
-        float _618 = dot(vec4(clamp(log2((length(_41.uCamPos - vec3(_678.x, 0.0, _678.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _725, _781, _809), vec4(0.25));
-        float _624 = dot(vec4(_725, clamp(log2((length(_41.uCamPos - vec3(_734.x, 0.0, _734.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _809, _837), vec4(0.25));
-        float _630 = dot(vec4(_809, _837, _893, clamp(log2((length(_41.uCamPos - vec3(_902.x, 0.0, _902.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x)), vec4(0.25));
-        vec4 _631 = vec4(_612, _618, _624, _630);
-        vPatchLods = _631;
-        vec4 _928 = exp2(-min(_631, _631.yzwx)) * _41.uMaxTessLevel.y;
-        gl_TessLevelOuter[0] = _928.x;
-        gl_TessLevelOuter[1] = _928.y;
-        gl_TessLevelOuter[2] = _928.z;
-        gl_TessLevelOuter[3] = _928.w;
-        float _935 = _41.uMaxTessLevel.y * exp2(-min(min(min(_612, _618), min(_624, _630)), _809));
-        gl_TessLevelInner[0] = _935;
-        gl_TessLevelInner[1] = _935;
+        vec2 _681 = (vPatchPosBase[0] + (vec2(-0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        vec2 _710 = (vPatchPosBase[0] + (vec2(0.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _729 = clamp(log2((length(_41.uCamPos - vec3(_710.x, 0.0, _710.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        vec2 _739 = (vPatchPosBase[0] + (vec2(1.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        vec2 _768 = (vPatchPosBase[0] + (vec2(-0.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _787 = clamp(log2((length(_41.uCamPos - vec3(_768.x, 0.0, _768.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        vec2 _797 = (vPatchPosBase[0] + (vec2(0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _816 = clamp(log2((length(_41.uCamPos - vec3(_797.x, 0.0, _797.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        vec2 _826 = (vPatchPosBase[0] + (vec2(1.5, 0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _845 = clamp(log2((length(_41.uCamPos - vec3(_826.x, 0.0, _826.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        vec2 _855 = (vPatchPosBase[0] + (vec2(-0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        vec2 _884 = (vPatchPosBase[0] + (vec2(0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _903 = clamp(log2((length(_41.uCamPos - vec3(_884.x, 0.0, _884.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x);
+        vec2 _913 = (vPatchPosBase[0] + (vec2(1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float _614 = dot(vec4(_787, _816, clamp(log2((length(_41.uCamPos - vec3(_855.x, 0.0, _855.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _903), vec4(0.25));
+        float _620 = dot(vec4(clamp(log2((length(_41.uCamPos - vec3(_681.x, 0.0, _681.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _729, _787, _816), vec4(0.25));
+        float _626 = dot(vec4(_729, clamp(log2((length(_41.uCamPos - vec3(_739.x, 0.0, _739.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x), _816, _845), vec4(0.25));
+        float _632 = dot(vec4(_816, _845, _903, clamp(log2((length(_41.uCamPos - vec3(_913.x, 0.0, _913.y)) + 9.9999997473787516355514526367188e-05) * _41.uDistanceMod), 0.0, _41.uMaxTessLevel.x)), vec4(0.25));
+        vec4 _633 = vec4(_614, _620, _626, _632);
+        vPatchLods = _633;
+        vec4 _940 = exp2(-min(_633, _633.yzwx)) * _41.uMaxTessLevel.y;
+        gl_TessLevelOuter[0] = _940.x;
+        gl_TessLevelOuter[1] = _940.y;
+        gl_TessLevelOuter[2] = _940.z;
+        gl_TessLevelOuter[3] = _940.w;
+        float _948 = _41.uMaxTessLevel.y * exp2(-min(min(min(_614, _620), min(_626, _632)), _816));
+        gl_TessLevelInner[0] = _948;
+        gl_TessLevelInner[1] = _948;
     }
 }
 
diff --git a/reference/opt/shaders/tese/water_tess.tese b/reference/opt/shaders/tese/water_tess.tese
index a2aa1044..6eb0d1aa 100644
--- a/reference/opt/shaders/tese/water_tess.tese
+++ b/reference/opt/shaders/tese/water_tess.tese
@@ -21,16 +21,16 @@ layout(location = 0) out vec3 vWorld;
 
 void main()
 {
-    vec2 _201 = vOutPatchPosBase + (gl_TessCoord.xy * _31.uPatchSize);
-    vec2 _214 = mix(vPatchLods.yx, vPatchLods.zw, vec2(gl_TessCoord.x));
-    float _221 = mix(_214.x, _214.y, gl_TessCoord.y);
-    mediump float _223 = floor(_221);
-    vec2 _125 = _201 * _31.uInvHeightmapSize;
-    vec2 _141 = _31.uInvHeightmapSize * exp2(_223);
+    vec2 _202 = vOutPatchPosBase + (gl_TessCoord.xy * _31.uPatchSize);
+    vec2 _216 = mix(vPatchLods.yx, vPatchLods.zw, vec2(gl_TessCoord.x));
+    float _223 = mix(_216.x, _216.y, gl_TessCoord.y);
+    mediump float _225 = floor(_223);
+    vec2 _125 = _202 * _31.uInvHeightmapSize;
+    vec2 _141 = _31.uInvHeightmapSize * exp2(_225);
     vGradNormalTex = vec4(_125 + (_31.uInvHeightmapSize * 0.5), _125 * _31.uScale.zw);
-    mediump vec3 _253 = mix(textureLod(uHeightmapDisplacement, _125 + (_141 * 0.5), _223).xyz, textureLod(uHeightmapDisplacement, _125 + (_141 * 1.0), _223 + 1.0).xyz, vec3(_221 - _223));
-    vec2 _171 = (_201 * _31.uScale.xy) + _253.yz;
-    vWorld = vec3(_171.x, _253.x, _171.y);
+    mediump vec3 _256 = mix(textureLod(uHeightmapDisplacement, _125 + (_141 * 0.5), _225).xyz, textureLod(uHeightmapDisplacement, _125 + (_141 * 1.0), _225 + 1.0).xyz, vec3(_223 - _225));
+    vec2 _171 = (_202 * _31.uScale.xy) + _256.yz;
+    vWorld = vec3(_171.x, _256.x, _171.y);
     gl_Position = _31.uMVP * vec4(vWorld, 1.0);
 }
 
diff --git a/reference/opt/shaders/vert/ground.vert b/reference/opt/shaders/vert/ground.vert
index c82c1037..f0136b5e 100644
--- a/reference/opt/shaders/vert/ground.vert
+++ b/reference/opt/shaders/vert/ground.vert
@@ -51,35 +51,35 @@ layout(location = 0) out vec2 TexCoord;
 
 void main()
 {
-    float _300 = all(equal(LODWeights, vec4(0.0))) ? _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.w : dot(LODWeights, _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].LODs);
-    float _302 = floor(_300);
-    uint _307 = uint(_302);
-    uvec2 _309 = uvec2(Position);
-    uvec2 _316 = (uvec2(1u) << uvec2(_307, _307 + 1u)) - uvec2(1u);
-    uint _382;
-    if (_309.x < 32u)
+    float _301 = all(equal(LODWeights, vec4(0.0))) ? _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.w : dot(LODWeights, _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].LODs);
+    float _303 = floor(_301);
+    uint _308 = uint(_303);
+    uvec2 _310 = uvec2(Position);
+    uvec2 _317 = (uvec2(1u) << uvec2(_308, _308 + 1u)) - uvec2(1u);
+    uint _384;
+    if (_310.x < 32u)
     {
-        _382 = _316.x;
+        _384 = _317.x;
     }
     else
     {
-        _382 = 0u;
+        _384 = 0u;
     }
-    uint _383;
-    if (_309.y < 32u)
+    uint _385;
+    if (_310.y < 32u)
     {
-        _383 = _316.y;
+        _385 = _317.y;
     }
     else
     {
-        _383 = 0u;
+        _385 = 0u;
     }
-    vec4 _344 = vec4((_309 + uvec2(_382, _383)).xyxy & (~_316).xxyy);
-    vec2 _173 = ((_53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.xz * _156.InvGroundSize_PatchScale.zw) + mix(_344.xy, _344.zw, vec2(_300 - _302))) * _156.InvGroundSize_PatchScale.xy;
-    mediump float _360 = textureLod(TexLOD, _173, 0.0).x * 7.96875;
-    float _362 = floor(_360);
-    vec2 _185 = _156.InvGroundSize_PatchScale.xy * exp2(_362);
-    vec3 _230 = (vec3(_173.x, mix(textureLod(TexHeightmap, _173 + (_185 * 0.5), _362).x, textureLod(TexHeightmap, _173 + (_185 * 1.0), _362 + 1.0).x, _360 - _362), _173.y) * _156.GroundScale.xyz) + _156.GroundPosition.xyz;
+    vec4 _345 = vec4((_310 + uvec2(_384, _385)).xyxy & (~_317).xxyy);
+    vec2 _173 = ((_53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.xz * _156.InvGroundSize_PatchScale.zw) + mix(_345.xy, _345.zw, vec2(_301 - _303))) * _156.InvGroundSize_PatchScale.xy;
+    mediump float _362 = textureLod(TexLOD, _173, 0.0).x * 7.96875;
+    float _364 = floor(_362);
+    vec2 _185 = _156.InvGroundSize_PatchScale.xy * exp2(_364);
+    vec3 _230 = (vec3(_173.x, mix(textureLod(TexHeightmap, _173 + (_185 * 0.5), _364).x, textureLod(TexHeightmap, _173 + (_185 * 1.0), _364 + 1.0).x, _362 - _364), _173.y) * _156.GroundScale.xyz) + _156.GroundPosition.xyz;
     EyeVec = _230 - _236.g_CamPos.xyz;
     TexCoord = _173 + (_156.InvGroundSize_PatchScale.xy * 0.5);
     gl_Position = (((_236.g_ViewProj_Row0 * _230.x) + (_236.g_ViewProj_Row1 * _230.y)) + (_236.g_ViewProj_Row2 * _230.z)) + _236.g_ViewProj_Row3;
diff --git a/reference/opt/shaders/vert/ocean.vert b/reference/opt/shaders/vert/ocean.vert
index 8f82c316..5c4e30d7 100644
--- a/reference/opt/shaders/vert/ocean.vert
+++ b/reference/opt/shaders/vert/ocean.vert
@@ -50,68 +50,68 @@ layout(location = 0) in vec4 Position;
 layout(location = 0) out vec3 EyeVec;
 layout(location = 1) out vec4 TexCoord;
 
-uvec4 _474;
+uvec4 _476;
 
 void main()
 {
-    float _350 = all(equal(LODWeights, vec4(0.0))) ? _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.w : dot(LODWeights, _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].LODs);
-    float _352 = floor(_350);
-    uint _357 = uint(_352);
-    uvec4 _359 = uvec4(Position);
-    uvec2 _366 = (uvec2(1u) << uvec2(_357, _357 + 1u)) - uvec2(1u);
-    bool _369 = _359.x < 32u;
-    uint _465;
-    if (_369)
+    float _351 = all(equal(LODWeights, vec4(0.0))) ? _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.w : dot(LODWeights, _53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].LODs);
+    float _353 = floor(_351);
+    uint _358 = uint(_353);
+    uvec4 _360 = uvec4(Position);
+    uvec2 _367 = (uvec2(1u) << uvec2(_358, _358 + 1u)) - uvec2(1u);
+    bool _370 = _360.x < 32u;
+    uint _467;
+    if (_370)
     {
-        _465 = _366.x;
+        _467 = _367.x;
     }
     else
     {
-        _465 = 0u;
+        _467 = 0u;
     }
-    uvec4 _443 = _474;
-    _443.x = _465;
-    bool _379 = _359.y < 32u;
-    uint _468;
-    if (_379)
-    {
-        _468 = _366.x;
-    }
-    else
-    {
-        _468 = 0u;
-    }
-    uvec4 _447 = _443;
-    _447.y = _468;
+    uvec4 _445 = _476;
+    _445.x = _467;
+    bool _380 = _360.y < 32u;
     uint _470;
-    if (_369)
+    if (_380)
     {
-        _470 = _366.y;
+        _470 = _367.x;
     }
     else
     {
         _470 = 0u;
     }
-    uvec4 _451 = _447;
-    _451.z = _470;
+    uvec4 _449 = _445;
+    _449.y = _470;
     uint _472;
-    if (_379)
+    if (_370)
     {
-        _472 = _366.y;
+        _472 = _367.y;
     }
     else
     {
         _472 = 0u;
     }
-    uvec4 _455 = _451;
-    _455.w = _472;
-    vec4 _415 = vec4((_359.xyxy + _455) & (~_366).xxyy);
-    vec2 _197 = ((_53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.xz * _180.InvOceanSize_PatchScale.zw) + mix(_415.xy, _415.zw, vec2(_350 - _352))) * _180.InvOceanSize_PatchScale.xy;
+    uvec4 _453 = _449;
+    _453.z = _472;
+    uint _474;
+    if (_380)
+    {
+        _474 = _367.y;
+    }
+    else
+    {
+        _474 = 0u;
+    }
+    uvec4 _457 = _453;
+    _457.w = _474;
+    vec4 _416 = vec4((_360.xyxy + _457) & (~_367).xxyy);
+    vec2 _197 = ((_53.Patches[(gl_InstanceID + SPIRV_Cross_BaseInstance)].Position.xz * _180.InvOceanSize_PatchScale.zw) + mix(_416.xy, _416.zw, vec2(_351 - _353))) * _180.InvOceanSize_PatchScale.xy;
     vec2 _204 = _197 * _180.NormalTexCoordScale.zw;
-    mediump float _431 = textureLod(TexLOD, _197, 0.0).x * 7.96875;
-    float _433 = floor(_431);
-    vec2 _220 = (_180.InvOceanSize_PatchScale.xy * exp2(_433)) * _180.NormalTexCoordScale.zw;
-    vec3 _267 = ((vec3(_197.x, 0.0, _197.y) + mix(textureLod(TexDisplacement, _204 + (_220 * 0.5), _433).yxz, textureLod(TexDisplacement, _204 + (_220 * 1.0), _433 + 1.0).yxz, vec3(_431 - _433))) * _180.OceanScale.xyz) + _180.OceanPosition.xyz;
+    mediump float _433 = textureLod(TexLOD, _197, 0.0).x * 7.96875;
+    float _435 = floor(_433);
+    vec2 _220 = (_180.InvOceanSize_PatchScale.xy * exp2(_435)) * _180.NormalTexCoordScale.zw;
+    vec3 _267 = ((vec3(_197.x, 0.0, _197.y) + mix(textureLod(TexDisplacement, _204 + (_220 * 0.5), _435).yxz, textureLod(TexDisplacement, _204 + (_220 * 1.0), _435 + 1.0).yxz, vec3(_433 - _435))) * _180.OceanScale.xyz) + _180.OceanPosition.xyz;
     EyeVec = _267 - _273.g_CamPos.xyz;
     TexCoord = vec4(_204, _204 * _180.NormalTexCoordScale.xy) + ((_180.InvOceanSize_PatchScale.xyxy * 0.5) * _180.NormalTexCoordScale.zwzw);
     gl_Position = (((_273.g_ViewProj_Row0 * _267.x) + (_273.g_ViewProj_Row1 * _267.y)) + (_273.g_ViewProj_Row2 * _267.z)) + _273.g_ViewProj_Row3;
diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
index 31283196..b30330cf 100644
--- a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
+++ b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
@@ -19,16 +19,16 @@ layout(set = 0, binding = 0, std430) restrict buffer LinkedList
 
 void main()
 {
-    Node _112;
+    Node _114;
     if (gl_WorkGroupID.x < 4u)
     {
-        _112 = _50.head1;
+        _114 = _50.head1;
     }
     else
     {
-        _112 = _50.head2;
+        _114 = _50.head2;
     }
-    _112.next.value = _50.head1.value + _50.head2.value;
+    _114.next.value = _50.head1.value + _50.head2.value;
     _50.head1.value = 20;
     _50.head1.value = _50.head2.value * 10;
 }
diff --git a/reference/opt/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk b/reference/opt/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk
index 69558dee..577487b6 100644
--- a/reference/opt/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk
+++ b/reference/opt/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk
@@ -30,55 +30,55 @@ void main()
 {
     int16_t _196 = 10s;
     int _197 = 20;
-    i8vec2 _201 = unpack8(10s);
-    i8vec2 _198 = _201;
+    i8vec2 _202 = unpack8(10s);
+    i8vec2 _198 = _202;
     i8vec4 _199 = unpack8(20);
-    _196 = pack16(_201);
+    _196 = pack16(_202);
     _197 = pack32(_199);
     ssbo.i8[0] = _199.x;
     ssbo.i8[1] = _199.y;
     ssbo.i8[2] = _199.z;
     ssbo.i8[3] = _199.w;
-    uint16_t _220 = 10us;
-    uint _221 = 20u;
-    u8vec2 _225 = unpack8(10us);
-    u8vec2 _222 = _225;
-    u8vec4 _223 = unpack8(20u);
-    _220 = pack16(_225);
-    _221 = pack32(_223);
-    ssbo.u8[0] = _223.x;
-    ssbo.u8[1] = _223.y;
-    ssbo.u8[2] = _223.z;
-    ssbo.u8[3] = _223.w;
-    i8vec4 _246 = i8vec4(vColor);
-    i8vec4 _244 = _246;
-    i8vec4 _251 = _246 + i8vec4(registers.i8);
-    _244 = _251;
-    i8vec4 _254 = _251 + i8vec4(-40);
-    _244 = _254;
-    i8vec4 _256 = _254 + i8vec4(-50);
-    _244 = _256;
-    i8vec4 _258 = _256 + i8vec4(int8_t(10), int8_t(20), int8_t(30), int8_t(40));
-    _244 = _258;
-    i8vec4 _263 = _258 + i8vec4(ssbo.i8[4]);
-    _244 = _263;
-    i8vec4 _268 = _263 + i8vec4(ubo.i8);
-    _244 = _268;
-    FragColorInt = ivec4(_268);
-    u8vec4 _274 = u8vec4(_246);
-    u8vec4 _271 = _274;
-    u8vec4 _279 = _274 + u8vec4(registers.u8);
-    _271 = _279;
-    u8vec4 _282 = _279 + u8vec4(216);
-    _271 = _282;
-    u8vec4 _284 = _282 + u8vec4(206);
-    _271 = _284;
-    u8vec4 _286 = _284 + u8vec4(uint8_t(10), uint8_t(20), uint8_t(30), uint8_t(40));
-    _271 = _286;
-    u8vec4 _291 = _286 + u8vec4(ssbo.u8[4]);
-    _271 = _291;
-    u8vec4 _296 = _291 + u8vec4(ubo.u8);
-    _271 = _296;
-    FragColorUint = uvec4(_296);
+    uint16_t _221 = 10us;
+    uint _222 = 20u;
+    u8vec2 _227 = unpack8(10us);
+    u8vec2 _223 = _227;
+    u8vec4 _224 = unpack8(20u);
+    _221 = pack16(_227);
+    _222 = pack32(_224);
+    ssbo.u8[0] = _224.x;
+    ssbo.u8[1] = _224.y;
+    ssbo.u8[2] = _224.z;
+    ssbo.u8[3] = _224.w;
+    i8vec4 _249 = i8vec4(vColor);
+    i8vec4 _246 = _249;
+    i8vec4 _254 = _249 + i8vec4(registers.i8);
+    _246 = _254;
+    i8vec4 _257 = _254 + i8vec4(-40);
+    _246 = _257;
+    i8vec4 _259 = _257 + i8vec4(-50);
+    _246 = _259;
+    i8vec4 _261 = _259 + i8vec4(int8_t(10), int8_t(20), int8_t(30), int8_t(40));
+    _246 = _261;
+    i8vec4 _266 = _261 + i8vec4(ssbo.i8[4]);
+    _246 = _266;
+    i8vec4 _271 = _266 + i8vec4(ubo.i8);
+    _246 = _271;
+    FragColorInt = ivec4(_271);
+    u8vec4 _278 = u8vec4(_249);
+    u8vec4 _274 = _278;
+    u8vec4 _283 = _278 + u8vec4(registers.u8);
+    _274 = _283;
+    u8vec4 _286 = _283 + u8vec4(216);
+    _274 = _286;
+    u8vec4 _288 = _286 + u8vec4(206);
+    _274 = _288;
+    u8vec4 _290 = _288 + u8vec4(uint8_t(10), uint8_t(20), uint8_t(30), uint8_t(40));
+    _274 = _290;
+    u8vec4 _295 = _290 + u8vec4(ssbo.u8[4]);
+    _274 = _295;
+    u8vec4 _300 = _295 + u8vec4(ubo.u8);
+    _274 = _300;
+    FragColorUint = uvec4(_300);
 }