Normalize all internal workaround methods to use spv prefix.

We have been interchanging spv and SPIRV_Cross_ for a while, which
causes weirdness since we don't explicitly ban SPIRV_Cross identifiers,
as these identifiers are generally used for interface variable
workarounds.

6 files changed, 17 insertions, 17 deletions

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 4df83d48..4f382ba8 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
@@ -12,7 +12,7 @@ layout(location = 0) out int _entryPointOutput;
 
 int _231;
 
-mat4 SPIRV_Cross_workaround_load_row_major(mat4 wrap) { return wrap; }
+mat4 spvWorkaroundRowMajor(mat4 wrap) { return wrap; }
 
 void main()
 {
@@ -37,7 +37,7 @@ void main()
                     _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;
                 } while(false);
-                vec4 _170 = (_223 * SPIRV_Cross_workaround_load_row_major(_11.lightVP[_222])) * vec4(fragWorld, 1.0);
+                vec4 _170 = (_223 * spvWorkaroundRowMajor(_11.lightVP[_222])) * vec4(fragWorld, 1.0);
                 float _172 = _170.z;
                 float _179 = _170.x;
                 float _181 = _170.y;
diff --git a/reference/opt/shaders/frag/ubo-load-row-major-workaround.frag b/reference/opt/shaders/frag/ubo-load-row-major-workaround.frag
index 6ed3f788..dbb008af 100644
--- a/reference/opt/shaders/frag/ubo-load-row-major-workaround.frag
+++ b/reference/opt/shaders/frag/ubo-load-row-major-workaround.frag
@@ -34,12 +34,12 @@ layout(binding = 3, std140) uniform UBONoWorkaround
 layout(location = 0) out vec4 FragColor;
 layout(location = 0) in vec4 Clip;
 
-NestedRowMajor SPIRV_Cross_workaround_load_row_major(NestedRowMajor wrap) { return wrap; }
-mat4 SPIRV_Cross_workaround_load_row_major(mat4 wrap) { return wrap; }
+NestedRowMajor spvWorkaroundRowMajor(NestedRowMajor wrap) { return wrap; }
+mat4 spvWorkaroundRowMajor(mat4 wrap) { return wrap; }
 
 void main()
 {
-    FragColor = (((SPIRV_Cross_workaround_load_row_major(_17.rm2).rm.B * SPIRV_Cross_workaround_load_row_major(_35.rm.B)) * SPIRV_Cross_workaround_load_row_major(_42.A)) * SPIRV_Cross_workaround_load_row_major(_42.C)) * Clip;
+    FragColor = (((spvWorkaroundRowMajor(_17.rm2).rm.B * spvWorkaroundRowMajor(_35.rm.B)) * spvWorkaroundRowMajor(_42.A)) * spvWorkaroundRowMajor(_42.C)) * Clip;
     FragColor += (_56.D * Clip);
     FragColor += (_42.A[1] * Clip);
 }
diff --git a/reference/opt/shaders/legacy/fragment/switch.legacy.frag b/reference/opt/shaders/legacy/fragment/switch.legacy.frag
index 1920958d..169f591a 100644
--- a/reference/opt/shaders/legacy/fragment/switch.legacy.frag
+++ b/reference/opt/shaders/legacy/fragment/switch.legacy.frag
@@ -10,7 +10,7 @@ void main()
     highp vec4 _65;
     highp vec4 _66;
     highp vec4 _68;
-    for (int SPIRV_Cross_Dummy25 = 0; SPIRV_Cross_Dummy25 < 1; SPIRV_Cross_Dummy25++)
+    for (int spvDummy25 = 0; spvDummy25 < 1; spvDummy25++)
     {
         if (_13 == 2)
         {
@@ -59,7 +59,7 @@ void main()
         }
     }
     highp vec4 _70;
-    for (int SPIRV_Cross_Dummy146 = 0; SPIRV_Cross_Dummy146 < 1; SPIRV_Cross_Dummy146++)
+    for (int spvDummy146 = 0; spvDummy146 < 1; spvDummy146++)
     {
         if ((_13 == 10) || (_13 == 20))
         {
diff --git a/reference/opt/shaders/legacy/vert/switch-nested.legacy.vert b/reference/opt/shaders/legacy/vert/switch-nested.legacy.vert
index fb8d46ec..7fcf6847 100644
--- a/reference/opt/shaders/legacy/vert/switch-nested.legacy.vert
+++ b/reference/opt/shaders/legacy/vert/switch-nested.legacy.vert
@@ -11,12 +11,12 @@ uniform UBO _34;
 void main()
 {
     vec4 _102;
-    for (int SPIRV_Cross_Dummy30 = 0; SPIRV_Cross_Dummy30 < 1; SPIRV_Cross_Dummy30++)
+    for (int spvDummy30 = 0; spvDummy30 < 1; spvDummy30++)
     {
         if (_34.func_arg != 0)
         {
             vec4 _101;
-            for (int SPIRV_Cross_Dummy45 = 0; SPIRV_Cross_Dummy45 < 1; SPIRV_Cross_Dummy45++)
+            for (int spvDummy45 = 0; spvDummy45 < 1; spvDummy45++)
             {
                 if (_34.inner_func_arg != 0)
                 {
diff --git a/reference/opt/shaders/legacy/vert/transpose.legacy.vert b/reference/opt/shaders/legacy/vert/transpose.legacy.vert
index 0f9b97a6..9c7f465a 100644
--- a/reference/opt/shaders/legacy/vert/transpose.legacy.vert
+++ b/reference/opt/shaders/legacy/vert/transpose.legacy.vert
@@ -11,9 +11,9 @@ uniform Buffer _13;
 
 attribute vec4 Position;
 
-mat4 SPIRV_Cross_workaround_load_row_major(mat4 wrap) { return wrap; }
+mat4 spvWorkaroundRowMajor(mat4 wrap) { return wrap; }
 
-mat4 SPIRV_Cross_Transpose(mat4 m)
+mat4 spvTranspose(mat4 m)
 {
     return mat4(m[0][0], m[1][0], m[2][0], m[3][0], m[0][1], m[1][1], m[2][1], m[3][1], m[0][2], m[1][2], m[2][2], m[3][2], m[0][3], m[1][3], m[2][3], m[3][3]);
 }
@@ -21,9 +21,9 @@ mat4 SPIRV_Cross_Transpose(mat4 m)
 void main()
 {
     mat4 _55 = _13.MVPRowMajor;
-    mat4 _61 = SPIRV_Cross_workaround_load_row_major(_13.MVPColMajor);
-    mat4 _80 = SPIRV_Cross_Transpose(_13.MVPRowMajor) * 2.0;
-    mat4 _87 = SPIRV_Cross_Transpose(_61) * 2.0;
-    gl_Position = (((((((((((SPIRV_Cross_workaround_load_row_major(_13.M) * (Position * _13.MVPRowMajor)) + (SPIRV_Cross_workaround_load_row_major(_13.M) * (SPIRV_Cross_workaround_load_row_major(_13.MVPColMajor) * Position))) + (SPIRV_Cross_workaround_load_row_major(_13.M) * (_13.MVPRowMajor * Position))) + (SPIRV_Cross_workaround_load_row_major(_13.M) * (Position * SPIRV_Cross_workaround_load_row_major(_13.MVPColMajor)))) + (_55 * Position)) + (Position * _61)) + (Position * _55)) + (_61 * Position)) + (_80 * Position)) + (_87 * Position)) + (Position * _80)) + (Position * _87);
+    mat4 _61 = spvWorkaroundRowMajor(_13.MVPColMajor);
+    mat4 _80 = spvTranspose(_13.MVPRowMajor) * 2.0;
+    mat4 _87 = spvTranspose(_61) * 2.0;
+    gl_Position = (((((((((((spvWorkaroundRowMajor(_13.M) * (Position * _13.MVPRowMajor)) + (spvWorkaroundRowMajor(_13.M) * (spvWorkaroundRowMajor(_13.MVPColMajor) * Position))) + (spvWorkaroundRowMajor(_13.M) * (_13.MVPRowMajor * Position))) + (spvWorkaroundRowMajor(_13.M) * (Position * spvWorkaroundRowMajor(_13.MVPColMajor)))) + (_55 * Position)) + (Position * _61)) + (Position * _55)) + (_61 * Position)) + (_80 * Position)) + (_87 * Position)) + (Position * _80)) + (Position * _87);
 }
 
diff --git a/reference/opt/shaders/vert/read-from-row-major-array.vert b/reference/opt/shaders/vert/read-from-row-major-array.vert
index 6c31cae9..6c68979b 100644
--- a/reference/opt/shaders/vert/read-from-row-major-array.vert
+++ b/reference/opt/shaders/vert/read-from-row-major-array.vert
@@ -8,11 +8,11 @@ layout(binding = 0, std140) uniform Block
 layout(location = 0) in vec4 a_position;
 layout(location = 0) out mediump float v_vtxResult;
 
-mat2x3 SPIRV_Cross_workaround_load_row_major(mat2x3 wrap) { return wrap; }
+mat2x3 spvWorkaroundRowMajor(mat2x3 wrap) { return wrap; }
 
 void main()
 {
     gl_Position = a_position;
-    v_vtxResult = ((float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[0].x - 2.0) < 0.0500000007450580596923828125) * float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[0].y - 6.0) < 0.0500000007450580596923828125)) * float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[0].z - (-6.0)) < 0.0500000007450580596923828125)) * ((float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[1].x) < 0.0500000007450580596923828125) * float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[1].y - 5.0) < 0.0500000007450580596923828125)) * float(abs(SPIRV_Cross_workaround_load_row_major(_104.var[0][0])[1].z - 5.0) < 0.0500000007450580596923828125));
+    v_vtxResult = ((float(abs(spvWorkaroundRowMajor(_104.var[0][0])[0].x - 2.0) < 0.0500000007450580596923828125) * float(abs(spvWorkaroundRowMajor(_104.var[0][0])[0].y - 6.0) < 0.0500000007450580596923828125)) * float(abs(spvWorkaroundRowMajor(_104.var[0][0])[0].z - (-6.0)) < 0.0500000007450580596923828125)) * ((float(abs(spvWorkaroundRowMajor(_104.var[0][0])[1].x) < 0.0500000007450580596923828125) * float(abs(spvWorkaroundRowMajor(_104.var[0][0])[1].y - 5.0) < 0.0500000007450580596923828125)) * float(abs(spvWorkaroundRowMajor(_104.var[0][0])[1].z - 5.0) < 0.0500000007450580596923828125));
 }