Merge pull request #2375 from KhronosGroup/fix-2366

Roll toolchain deps.

checkout_glslang_spirv_tools.sh

@@ -2,9 +2,9 @@
 # Copyright 2016-2021 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-GLSLANG_REV=a7785ea1ff5b10bfc2d8ca77fdad5929562897b7
-SPIRV_TOOLS_REV=afaf8fda2ad0364655909b56c8b634ce89095bb5
-SPIRV_HEADERS_REV=e867c06631767a2d96424cbec530f9ee5e78180f
+GLSLANG_REV=10ee92feb00712f444783032f5c9ee798887670d
+SPIRV_TOOLS_REV=fd96922e9a1814d92df46df03277788c799a4fad
+SPIRV_HEADERS_REV=ea77f2a826bc820cb8f57f9b2a7c7eccb681c73
 PROTOCOL=https
 
 if [ -d external/glslang ]; then

reference/opt/shaders-hlsl/frag/array-lut-no-loop-variable.frag

@@ -1,6 +1,12 @@
 static const float _17[5] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f };
 
 static float4 FragColor;
+static float4 v0;
+
+struct SPIRV_Cross_Input
+{
+    float4 v0 : TEXCOORD0;
+};
 
 struct SPIRV_Cross_Output
 {
@@ -18,8 +24,9 @@ void frag_main()
     }
 }
 
-SPIRV_Cross_Output main()
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
 {
+    v0 = stage_input.v0;
     frag_main();
     SPIRV_Cross_Output stage_output;
     stage_output.FragColor = FragColor;

reference/opt/shaders-hlsl/frag/no-return2.frag

@@ -1,8 +1,16 @@
+static float4 vColor;
+
+struct SPIRV_Cross_Input
+{
+    float4 vColor : TEXCOORD0;
+};
+
 void frag_main()
 {
 }
 
-void main()
+void main(SPIRV_Cross_Input stage_input)
 {
+    vColor = stage_input.vColor;
     frag_main();
 }

reference/opt/shaders-hlsl/frag/switch-unreachable-break.frag

@@ -6,6 +6,12 @@ cbuffer UBO : register(b0)
 
 
 static float4 FragColor;
+static float4 vInput;
+
+struct SPIRV_Cross_Input
+{
+    float4 vInput : TEXCOORD0;
+};
 
 struct SPIRV_Cross_Output
 {
@@ -40,8 +46,9 @@ void frag_main()
     FragColor = float4(_45.x ? 10.0f.xxxx.x : 20.0f.xxxx.x, _45.y ? 10.0f.xxxx.y : 20.0f.xxxx.y, _45.z ? 10.0f.xxxx.z : 20.0f.xxxx.z, _45.w ? 10.0f.xxxx.w : 20.0f.xxxx.w);
 }
 
-SPIRV_Cross_Output main()
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
 {
+    vInput = stage_input.vInput;
     frag_main();
     SPIRV_Cross_Output stage_output;
     stage_output.FragColor = FragColor;

reference/opt/shaders-hlsl/frag/unary-enclose.frag

@@ -1,9 +1,11 @@
 static float4 FragColor;
 static float4 vIn;
+static int4 vIn1;
 
 struct SPIRV_Cross_Input
 {
     float4 vIn : TEXCOORD0;
+    nointerpolation int4 vIn1 : TEXCOORD1;
 };
 
 struct SPIRV_Cross_Output
@@ -19,6 +21,7 @@ void frag_main()
 SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
 {
     vIn = stage_input.vIn;
+    vIn1 = stage_input.vIn1;
     frag_main();
     SPIRV_Cross_Output stage_output;
     stage_output.FragColor = FragColor;

reference/opt/shaders-hlsl/vert/invariant.vert

@@ -19,7 +19,8 @@ struct SPIRV_Cross_Output
 
 void vert_main()
 {
-    float4 _21 = mad(vInput1, vInput2, vInput0);
+    float4 _20 = vInput1 * vInput2;
+    float4 _21 = vInput0 + _20;
     gl_Position = _21;
     float4 _27 = vInput0 - vInput1;
     float4 _29 = _27 * vInput2;

reference/opt/shaders-hlsl/vert/return-array.vert

@@ -1,8 +1,10 @@
 static float4 gl_Position;
+static float4 vInput0;
 static float4 vInput1;
 
 struct SPIRV_Cross_Input
 {
+    float4 vInput0 : TEXCOORD0;
     float4 vInput1 : TEXCOORD1;
 };
 
@@ -18,6 +20,7 @@ void vert_main()
 
 SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
 {
+    vInput0 = stage_input.vInput0;
     vInput1 = stage_input.vInput1;
     vert_main();
     SPIRV_Cross_Output stage_output;

reference/opt/shaders-msl/asm/frag/descriptor-array-unnamed.asm.frag

@@ -42,7 +42,7 @@ fragment main0_out main0(const device _6* _7_0 [[buffer(0)]], const device _6* _
     };
 
     main0_out out = {};
-    out.m_4 = fma(_10[_21._m0]->_m0, float4(0.20000000298023223876953125), _7[_21._m0]->_m0);
+    out.m_4 = _7[_21._m0]->_m0 + (_10[_21._m0]->_m0 * float4(0.20000000298023223876953125));
     return out;
 }
 

reference/opt/shaders-msl/asm/frag/interpolation-qualifiers-struct.asm.frag

@@ -41,7 +41,7 @@ fragment main0_out main0(main0_in in [[stage_in]])
     inp.v4 = in.inp_v4;
     inp.v5 = in.inp_v5;
     inp.v6 = in.inp_v6;
-    out.FragColor = float4(inp.v0.x + inp.v1.y, inp.v2.xy, fma(inp.v3.w, inp.v4, inp.v5) - inp.v6);
+    out.FragColor = float4(inp.v0.x + inp.v1.y, inp.v2.xy, ((inp.v3.w * inp.v4) + inp.v5) - inp.v6);
     return out;
 }
 

reference/opt/shaders-msl/asm/frag/vector-shuffle-oom.asm.frag

@@ -96,10 +96,11 @@ struct main0_out
 fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348 [[buffer(1)]], constant _7& _15259 [[buffer(2)]], texture2d<float> _5785 [[texture(0)]], texture2d<float> _3312 [[texture(1)]], texture2d<float> _4862 [[texture(2)]], sampler _5688 [[sampler(0)]], sampler _4646 [[sampler(1)]], sampler _3594 [[sampler(2)]], float4 gl_FragCoord [[position]])
 {
     main0_out out = {};
+    float2 _19927 = gl_FragCoord.xy * _15259._m23.xy;
     float4 _17581 = _22044._m2 * _22044._m0.xyxy;
     float2 _7011 = _17581.xy;
     float2 _21058 = _17581.zw;
-    float2 _13149 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(0.0, -2.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13149 = fast::clamp(_19927 + (float2(0.0, -2.0) * _22044._m0.xy), _7011, _21058);
     float3 _12103 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13149, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17670 = _3312.sample(_4646, _13149, level(0.0));
     float _16938 = _17670.y;
@@ -112,7 +113,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7719 = _12103;
     }
-    float2 _13150 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(-1.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13150 = fast::clamp(_19927 + (float2(-1.0) * _22044._m0.xy), _7011, _21058);
     float3 _12104 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13150, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17671 = _3312.sample(_4646, _13150, level(0.0));
     float _16939 = _17671.y;
@@ -125,7 +126,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7720 = _12104;
     }
-    float2 _13151 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(0.0, -1.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13151 = fast::clamp(_19927 + (float2(0.0, -1.0) * _22044._m0.xy), _7011, _21058);
     float3 _12105 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13151, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17672 = _3312.sample(_4646, _13151, level(0.0));
     float _16940 = _17672.y;
@@ -138,7 +139,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7721 = _12105;
     }
-    float2 _13152 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(1.0, -1.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13152 = fast::clamp(_19927 + (float2(1.0, -1.0) * _22044._m0.xy), _7011, _21058);
     float3 _12106 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13152, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17673 = _3312.sample(_4646, _13152, level(0.0));
     float _16941 = _17673.y;
@@ -151,7 +152,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7722 = _12106;
     }
-    float2 _13153 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(-2.0, 0.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13153 = fast::clamp(_19927 + (float2(-2.0, 0.0) * _22044._m0.xy), _7011, _21058);
     float3 _12107 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13153, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17674 = _3312.sample(_4646, _13153, level(0.0));
     float _16942 = _17674.y;
@@ -164,7 +165,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7723 = _12107;
     }
-    float2 _13154 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(-1.0, 0.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13154 = fast::clamp(_19927 + (float2(-1.0, 0.0) * _22044._m0.xy), _7011, _21058);
     float3 _12108 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13154, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17675 = _3312.sample(_4646, _13154, level(0.0));
     float _16943 = _17675.y;
@@ -177,7 +178,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7724 = _12108;
     }
-    float2 _13155 = fast::clamp(gl_FragCoord.xy * _15259._m23.xy, _7011, _21058);
+    float2 _13155 = fast::clamp(_19927, _7011, _21058);
     float3 _12109 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13155, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17676 = _3312.sample(_4646, _13155, level(0.0));
     float _16944 = _17676.y;
@@ -190,7 +191,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7725 = _12109;
     }
-    float2 _13156 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(1.0, 0.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13156 = fast::clamp(_19927 + (float2(1.0, 0.0) * _22044._m0.xy), _7011, _21058);
     float3 _12110 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13156, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17677 = _3312.sample(_4646, _13156, level(0.0));
     float _16945 = _17677.y;
@@ -203,7 +204,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7726 = _12110;
     }
-    float2 _13157 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(2.0, 0.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13157 = fast::clamp(_19927 + (float2(2.0, 0.0) * _22044._m0.xy), _7011, _21058);
     float3 _12111 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13157, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17678 = _3312.sample(_4646, _13157, level(0.0));
     float _16946 = _17678.y;
@@ -216,7 +217,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7727 = _12111;
     }
-    float2 _13158 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(-1.0, 1.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13158 = fast::clamp(_19927 + (float2(-1.0, 1.0) * _22044._m0.xy), _7011, _21058);
     float3 _12112 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13158, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17679 = _3312.sample(_4646, _13158, level(0.0));
     float _16947 = _17679.y;
@@ -229,7 +230,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7728 = _12112;
     }
-    float2 _13159 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(0.0, 1.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13159 = fast::clamp(_19927 + (float2(0.0, 1.0) * _22044._m0.xy), _7011, _21058);
     float3 _12113 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13159, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17680 = _3312.sample(_4646, _13159, level(0.0));
     float _16948 = _17680.y;
@@ -242,7 +243,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7729 = _12113;
     }
-    float2 _13160 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, _22044._m0.xy), _7011, _21058);
+    float2 _13160 = fast::clamp(_19927 + _22044._m0.xy, _7011, _21058);
     float3 _12114 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13160, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17681 = _3312.sample(_4646, _13160, level(0.0));
     float _16949 = _17681.y;
@@ -255,7 +256,7 @@ fragment main0_out main0(constant _3& _22044 [[buffer(0)]], constant _4& _12348
     {
         _7730 = _12114;
     }
-    float2 _13161 = fast::clamp(fma(gl_FragCoord.xy, _15259._m23.xy, float2(0.0, 2.0) * _22044._m0.xy), _7011, _21058);
+    float2 _13161 = fast::clamp(_19927 + (float2(0.0, 2.0) * _22044._m0.xy), _7011, _21058);
     float3 _12115 = float3(_12348._m5) * fast::clamp(_5785.sample(_5688, _13161, level(0.0)).w * _22044._m1, 0.0, 1.0);
     float4 _17682 = _3312.sample(_4646, _13161, level(0.0));
     float _16950 = _17682.y;

reference/opt/shaders-msl/asm/tese/unnamed-builtin-array.asm.tese

@@ -67,7 +67,7 @@ struct main0_patchIn
     gl_TessLevelOuter[2] = patchIn.gl_TessLevelOuter[2];
     gl_TessLevelOuter[3] = patchIn.gl_TessLevelOuter[3];
     float3 gl_TessCoord = float3(gl_TessCoordIn.x, gl_TessCoordIn.y, 0.0);
-    out.gl_Position = float4(fma(gl_TessCoord.x * gl_TessLevelInner[0], gl_TessLevelOuter[0], ((1.0 - gl_TessCoord.x) * gl_TessLevelInner[0]) * gl_TessLevelOuter[2]), fma(gl_TessCoord.y * gl_TessLevelInner[1], gl_TessLevelOuter[1], ((1.0 - gl_TessCoord.y) * gl_TessLevelInner[1]) * gl_TessLevelOuter[3]), 0.0, 1.0);
+    out.gl_Position = float4(((gl_TessCoord.x * gl_TessLevelInner[0]) * gl_TessLevelOuter[0]) + (((1.0 - gl_TessCoord.x) * gl_TessLevelInner[0]) * gl_TessLevelOuter[2]), ((gl_TessCoord.y * gl_TessLevelInner[1]) * gl_TessLevelOuter[1]) + (((1.0 - gl_TessCoord.y) * gl_TessLevelInner[1]) * gl_TessLevelOuter[3]), 0.0, 1.0);
     return out;
 }
 

reference/opt/shaders-msl/comp/buffer_device_address.msl2.comp

@@ -27,15 +27,15 @@ constant uint3 gl_WorkGroupSize [[maybe_unused]] = uint3(8u, 8u, 1u);
 kernel void main0(constant Registers& registers [[buffer(0)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]], uint3 gl_NumWorkGroups [[threadgroups_per_grid]], uint3 gl_WorkGroupID [[threadgroup_position_in_grid]])
 {
     uint2 local_offset = gl_GlobalInvocationID.xy;
-    float _70 = fract(fma(float(gl_WorkGroupID.z), 0.100000001490116119384765625, registers.fract_time));
+    float _70 = fract(registers.fract_time + (float(gl_WorkGroupID.z) * 0.100000001490116119384765625));
     float _71 = 6.283125400543212890625 * _70;
     float2 pos = float2(gl_GlobalInvocationID.xy);
-    pos.x = fma(0.20000000298023223876953125, sin(fma(2.2000000476837158203125, pos.x, _71)), pos.x);
-    pos.y = fma(0.20000000298023223876953125, sin(fma(2.25, pos.y, _70 * 12.56625080108642578125)), pos.y);
-    pos.x = fma(0.20000000298023223876953125, cos(fma(1.7999999523162841796875, pos.y, _70 * 18.849376678466796875)), pos.x);
-    pos.y = fma(0.20000000298023223876953125, cos(fma(2.849999904632568359375, pos.x, _70 * 25.1325016021728515625)), pos.y);
-    pos.x = fma(0.5, sin(_71), pos.x);
-    pos.y = fma(0.5, sin(fma(6.283125400543212890625, _70, 0.300000011920928955078125)), pos.y);
-    registers.references->buffers[gl_WorkGroupID.z]->positions[((local_offset.y * 8u) * gl_NumWorkGroups.x) + local_offset.x] = (pos / fma(float2(8.0), float2(gl_NumWorkGroups.xy), float2(-1.0))) - float2(0.5);
+    pos.x += (0.20000000298023223876953125 * sin((2.2000000476837158203125 * pos.x) + _71));
+    pos.y += (0.20000000298023223876953125 * sin((2.25 * pos.y) + (_70 * 12.56625080108642578125)));
+    pos.x += (0.20000000298023223876953125 * cos((1.7999999523162841796875 * pos.y) + (_70 * 18.849376678466796875)));
+    pos.y += (0.20000000298023223876953125 * cos((2.849999904632568359375 * pos.x) + (_70 * 25.1325016021728515625)));
+    pos.x += (0.5 * sin(_71));
+    pos.y += (0.5 * sin(_71 + 0.300000011920928955078125));
+    registers.references->buffers[gl_WorkGroupID.z]->positions[((local_offset.y * 8u) * gl_NumWorkGroups.x) + local_offset.x] = (pos / ((float2(8.0) * float2(gl_NumWorkGroups.xy)) - float2(1.0))) - float2(0.5);
 }
 

reference/opt/shaders-msl/frag/interpolation-qualifiers-block.frag

@@ -41,7 +41,7 @@ fragment main0_out main0(main0_in in [[stage_in]])
     inp.v4 = in.inp_v4;
     inp.v5 = in.inp_v5;
     inp.v6 = in.inp_v6;
-    out.FragColor = float4(inp.v0.x + inp.v1.y, inp.v2.xy, fma(inp.v3.w, inp.v4, inp.v5) - inp.v6);
+    out.FragColor = float4(inp.v0.x + inp.v1.y, inp.v2.xy, ((inp.v3.w * inp.v4) + inp.v5) - inp.v6);
     return out;
 }
 

reference/opt/shaders-msl/frag/interpolation-qualifiers.frag

@@ -22,7 +22,7 @@ struct main0_in
 fragment main0_out main0(main0_in in [[stage_in]])
 {
     main0_out out = {};
-    out.FragColor = float4(in.v0.x + in.v1.y, in.v2.xy, fma(in.v3.w, in.v4, in.v5) - in.v6);
+    out.FragColor = float4(in.v0.x + in.v1.y, in.v2.xy, ((in.v3.w * in.v4) + in.v5) - in.v6);
     return out;
 }
 

reference/opt/shaders-msl/tesc/water_tess.multi-patch.tesc

@@ -58,20 +58,20 @@ kernel void main0(constant UBO& _41 [[buffer(0)]], uint3 gl_GlobalInvocationID [
     else
     {
         patchOut.vOutPatchPosBase = gl_in[0].vPatchPosBase.xy;
-        float2 _681 = fma(float2(-0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
-        float2 _710 = fma(float2(0.5, -0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _681 = (gl_in[0].vPatchPosBase.xy + (float2(-0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _710 = (gl_in[0].vPatchPosBase.xy + (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 = fma(float2(1.5, -0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
-        float2 _768 = fma(float2(-0.5, 0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _739 = (gl_in[0].vPatchPosBase.xy + (float2(1.5, -0.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _768 = (gl_in[0].vPatchPosBase.xy + (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 = fma(float2(0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _797 = (gl_in[0].vPatchPosBase.xy + (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 = fma(float2(1.5, 0.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _826 = (gl_in[0].vPatchPosBase.xy + (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 = fma(float2(-0.5, 1.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
-        float2 _884 = fma(float2(0.5, 1.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _855 = (gl_in[0].vPatchPosBase.xy + (float2(-0.5, 1.5) * _41.uPatchSize)) * _41.uScale.xy;
+        float2 _884 = (gl_in[0].vPatchPosBase.xy + (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 = fma(float2(1.5), _41.uPatchSize, gl_in[0].vPatchPosBase.xy) * _41.uScale.xy;
+        float2 _913 = (gl_in[0].vPatchPosBase.xy + (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));