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.

12 files changed, 146 insertions, 146 deletions

diff --git a/reference/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag b/reference/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag
index ed53720d..2527d10f 100644
--- a/reference/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag
+++ b/reference/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag
@@ -8,7 +8,7 @@ struct SPIRV_Cross_Output
     int2 Size : SV_Target0;
 };
 
-uint2 SPIRV_Cross_textureSize(Texture2D<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2D<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
@@ -19,7 +19,7 @@ void frag_main()
 {
     uint _19_dummy_parameter;
     uint _20_dummy_parameter;
-    Size = int2(SPIRV_Cross_textureSize(uTexture, uint(0), _19_dummy_parameter)) + int2(SPIRV_Cross_textureSize(uTexture, uint(1), _20_dummy_parameter));
+    Size = int2(spvTextureSize(uTexture, uint(0), _19_dummy_parameter)) + int2(spvTextureSize(uTexture, uint(1), _20_dummy_parameter));
 }
 
 SPIRV_Cross_Output main()
diff --git a/reference/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag b/reference/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag
index 525a9177..88fad10f 100644
--- a/reference/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag
+++ b/reference/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag
@@ -5,12 +5,12 @@ struct SPIRV_Cross_Output
     float4 FragColor : SV_Target0;
 };
 
-uint64_t SPIRV_Cross_packUint2x32(uint2 value)
+uint64_t spvPackUint2x32(uint2 value)
 {
     return (uint64_t(value.y) << 32) | uint64_t(value.x);
 }
 
-uint2 SPIRV_Cross_unpackUint2x32(uint64_t value)
+uint2 spvUnpackUint2x32(uint64_t value)
 {
     uint2 Unpacked;
     Unpacked.x = uint(value & 0xffffffff);
@@ -20,8 +20,8 @@ uint2 SPIRV_Cross_unpackUint2x32(uint64_t value)
 
 void frag_main()
 {
-    uint64_t _packed = SPIRV_Cross_packUint2x32(uint2(18u, 52u));
-    uint2 unpacked = SPIRV_Cross_unpackUint2x32(_packed);
+    uint64_t _packed = spvPackUint2x32(uint2(18u, 52u));
+    uint2 unpacked = spvUnpackUint2x32(_packed);
     FragColor = float4(float(unpacked.x), float(unpacked.y), 1.0f, 1.0f);
 }
 
diff --git a/reference/shaders-hlsl/comp/inverse.comp b/reference/shaders-hlsl/comp/inverse.comp
index f9ec89aa..698f647c 100644
--- a/reference/shaders-hlsl/comp/inverse.comp
+++ b/reference/shaders-hlsl/comp/inverse.comp
@@ -5,7 +5,7 @@ ByteAddressBuffer _20 : register(t1);
 
 // Returns the inverse of a matrix, by using the algorithm of calculating the classical
 // adjoint and dividing by the determinant. The contents of the matrix are changed.
-float2x2 SPIRV_Cross_Inverse(float2x2 m)
+float2x2 spvInverse(float2x2 m)
 {
     float2x2 adj;	// The adjoint matrix (inverse after dividing by determinant)
 
@@ -25,29 +25,29 @@ float2x2 SPIRV_Cross_Inverse(float2x2 m)
 }
 
 // Returns the determinant of a 2x2 matrix.
-float SPIRV_Cross_Det2x2(float a1, float a2, float b1, float b2)
+float spvDet2x2(float a1, float a2, float b1, float b2)
 {
     return a1 * b2 - b1 * a2;
 }
 
 // Returns the inverse of a matrix, by using the algorithm of calculating the classical
 // adjoint and dividing by the determinant. The contents of the matrix are changed.
-float3x3 SPIRV_Cross_Inverse(float3x3 m)
+float3x3 spvInverse(float3x3 m)
 {
     float3x3 adj;	// The adjoint matrix (inverse after dividing by determinant)
 
     // Create the transpose of the cofactors, as the classical adjoint of the matrix.
-    adj[0][0] =  SPIRV_Cross_Det2x2(m[1][1], m[1][2], m[2][1], m[2][2]);
-    adj[0][1] = -SPIRV_Cross_Det2x2(m[0][1], m[0][2], m[2][1], m[2][2]);
-    adj[0][2] =  SPIRV_Cross_Det2x2(m[0][1], m[0][2], m[1][1], m[1][2]);
+    adj[0][0] =  spvDet2x2(m[1][1], m[1][2], m[2][1], m[2][2]);
+    adj[0][1] = -spvDet2x2(m[0][1], m[0][2], m[2][1], m[2][2]);
+    adj[0][2] =  spvDet2x2(m[0][1], m[0][2], m[1][1], m[1][2]);
 
-    adj[1][0] = -SPIRV_Cross_Det2x2(m[1][0], m[1][2], m[2][0], m[2][2]);
-    adj[1][1] =  SPIRV_Cross_Det2x2(m[0][0], m[0][2], m[2][0], m[2][2]);
-    adj[1][2] = -SPIRV_Cross_Det2x2(m[0][0], m[0][2], m[1][0], m[1][2]);
+    adj[1][0] = -spvDet2x2(m[1][0], m[1][2], m[2][0], m[2][2]);
+    adj[1][1] =  spvDet2x2(m[0][0], m[0][2], m[2][0], m[2][2]);
+    adj[1][2] = -spvDet2x2(m[0][0], m[0][2], m[1][0], m[1][2]);
 
-    adj[2][0] =  SPIRV_Cross_Det2x2(m[1][0], m[1][1], m[2][0], m[2][1]);
-    adj[2][1] = -SPIRV_Cross_Det2x2(m[0][0], m[0][1], m[2][0], m[2][1]);
-    adj[2][2] =  SPIRV_Cross_Det2x2(m[0][0], m[0][1], m[1][0], m[1][1]);
+    adj[2][0] =  spvDet2x2(m[1][0], m[1][1], m[2][0], m[2][1]);
+    adj[2][1] = -spvDet2x2(m[0][0], m[0][1], m[2][0], m[2][1]);
+    adj[2][2] =  spvDet2x2(m[0][0], m[0][1], m[1][0], m[1][1]);
 
     // Calculate the determinant as a combination of the cofactors of the first row.
     float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]);
@@ -58,37 +58,37 @@ float3x3 SPIRV_Cross_Inverse(float3x3 m)
 }
 
 // Returns the determinant of a 3x3 matrix.
-float SPIRV_Cross_Det3x3(float a1, float a2, float a3, float b1, float b2, float b3, float c1, float c2, float c3)
+float spvDet3x3(float a1, float a2, float a3, float b1, float b2, float b3, float c1, float c2, float c3)
 {
-    return a1 * SPIRV_Cross_Det2x2(b2, b3, c2, c3) - b1 * SPIRV_Cross_Det2x2(a2, a3, c2, c3) + c1 * SPIRV_Cross_Det2x2(a2, a3, b2, b3);
+    return a1 * spvDet2x2(b2, b3, c2, c3) - b1 * spvDet2x2(a2, a3, c2, c3) + c1 * spvDet2x2(a2, a3, b2, b3);
 }
 
 // Returns the inverse of a matrix, by using the algorithm of calculating the classical
 // adjoint and dividing by the determinant. The contents of the matrix are changed.
-float4x4 SPIRV_Cross_Inverse(float4x4 m)
+float4x4 spvInverse(float4x4 m)
 {
     float4x4 adj;	// The adjoint matrix (inverse after dividing by determinant)
 
     // Create the transpose of the cofactors, as the classical adjoint of the matrix.
-    adj[0][0] =  SPIRV_Cross_Det3x3(m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
-    adj[0][1] = -SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
-    adj[0][2] =  SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[3][1], m[3][2], m[3][3]);
-    adj[0][3] = -SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3]);
-
-    adj[1][0] = -SPIRV_Cross_Det3x3(m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
-    adj[1][1] =  SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
-    adj[1][2] = -SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[3][0], m[3][2], m[3][3]);
-    adj[1][3] =  SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3]);
-
-    adj[2][0] =  SPIRV_Cross_Det3x3(m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
-    adj[2][1] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
-    adj[2][2] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[3][0], m[3][1], m[3][3]);
-    adj[2][3] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3]);
-
-    adj[3][0] = -SPIRV_Cross_Det3x3(m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
-    adj[3][1] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
-    adj[3][2] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[3][0], m[3][1], m[3][2]);
-    adj[3][3] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
+    adj[0][0] =  spvDet3x3(m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][1] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][2] =  spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][3] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3]);
+
+    adj[1][0] = -spvDet3x3(m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][1] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][2] = -spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][3] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3]);
+
+    adj[2][0] =  spvDet3x3(m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][1] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][2] =  spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][3] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3]);
+
+    adj[3][0] = -spvDet3x3(m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][1] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][2] = -spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][3] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
 
     // Calculate the determinant as a combination of the cofactors of the first row.
     float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]) + (adj[0][3] * m[3][0]);
@@ -101,16 +101,16 @@ float4x4 SPIRV_Cross_Inverse(float4x4 m)
 void comp_main()
 {
     float2x2 _23 = asfloat(uint2x2(_20.Load2(0), _20.Load2(8)));
-    float2x2 _24 = SPIRV_Cross_Inverse(_23);
+    float2x2 _24 = spvInverse(_23);
     _15.Store2(0, asuint(_24[0]));
     _15.Store2(8, asuint(_24[1]));
     float3x3 _29 = asfloat(uint3x3(_20.Load3(16), _20.Load3(32), _20.Load3(48)));
-    float3x3 _30 = SPIRV_Cross_Inverse(_29);
+    float3x3 _30 = spvInverse(_29);
     _15.Store3(16, asuint(_30[0]));
     _15.Store3(32, asuint(_30[1]));
     _15.Store3(48, asuint(_30[2]));
     float4x4 _35 = asfloat(uint4x4(_20.Load4(64), _20.Load4(80), _20.Load4(96), _20.Load4(112)));
-    float4x4 _36 = SPIRV_Cross_Inverse(_35);
+    float4x4 _36 = spvInverse(_35);
     _15.Store4(64, asuint(_36[0]));
     _15.Store4(80, asuint(_36[1]));
     _15.Store4(96, asuint(_36[2]));
diff --git a/reference/shaders-hlsl/frag/fp16-packing.frag b/reference/shaders-hlsl/frag/fp16-packing.frag
index d8782822..54b91e2a 100644
--- a/reference/shaders-hlsl/frag/fp16-packing.frag
+++ b/reference/shaders-hlsl/frag/fp16-packing.frag
@@ -15,21 +15,21 @@ struct SPIRV_Cross_Output
     uint FP16Out : SV_Target1;
 };
 
-uint SPIRV_Cross_packHalf2x16(float2 value)
+uint spvPackHalf2x16(float2 value)
 {
     uint2 Packed = f32tof16(value);
     return Packed.x | (Packed.y << 16);
 }
 
-float2 SPIRV_Cross_unpackHalf2x16(uint value)
+float2 spvUnpackHalf2x16(uint value)
 {
     return f16tof32(uint2(value & 0xffff, value >> 16));
 }
 
 void frag_main()
 {
-    FP32Out = SPIRV_Cross_unpackHalf2x16(FP16);
-    FP16Out = SPIRV_Cross_packHalf2x16(FP32);
+    FP32Out = spvUnpackHalf2x16(FP16);
+    FP16Out = spvPackHalf2x16(FP32);
 }
 
 SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
diff --git a/reference/shaders-hlsl/frag/image-query-selective.frag b/reference/shaders-hlsl/frag/image-query-selective.frag
index 25c12da6..69fe83fd 100644
--- a/reference/shaders-hlsl/frag/image-query-selective.frag
+++ b/reference/shaders-hlsl/frag/image-query-selective.frag
@@ -20,49 +20,49 @@ SamplerState _uSamplerMSArray_sampler : register(s8);
 Texture2D<float4> uSampler2D : register(t1);
 SamplerState _uSampler2D_sampler : register(s1);
 
-uint SPIRV_Cross_textureSize(Texture1D<float4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Texture1D<float4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(Level, ret.x, Param);
     return ret;
 }
 
-uint SPIRV_Cross_textureSize(Texture1D<int4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Texture1D<int4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(Level, ret.x, Param);
     return ret;
 }
 
-uint SPIRV_Cross_textureSize(Texture1D<uint4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Texture1D<uint4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(Level, ret.x, Param);
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(Texture2D<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2D<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture2DArray<int4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture2DArray<int4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture3D<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture3D<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint SPIRV_Cross_textureSize(Buffer<float4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Buffer<float4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -70,28 +70,28 @@ uint SPIRV_Cross_textureSize(Buffer<float4> Tex, uint Level, out uint Param)
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(TextureCube<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(TextureCube<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(TextureCubeArray<uint4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(TextureCubeArray<uint4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(Texture2DMS<int4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2DMS<int4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture2DMSArray<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture2DMSArray<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(ret.x, ret.y, ret.z, Param);
@@ -101,42 +101,42 @@ uint3 SPIRV_Cross_textureSize(Texture2DMSArray<float4> Tex, uint Level, out uint
 void frag_main()
 {
     uint _17_dummy_parameter;
-    int a = int(SPIRV_Cross_textureSize(uSampler1DUint, uint(0), _17_dummy_parameter));
+    int a = int(spvTextureSize(uSampler1DUint, uint(0), _17_dummy_parameter));
     uint _24_dummy_parameter;
-    a = int(SPIRV_Cross_textureSize(uSampler1DInt, uint(0), _24_dummy_parameter));
+    a = int(spvTextureSize(uSampler1DInt, uint(0), _24_dummy_parameter));
     uint _32_dummy_parameter;
-    a = int(SPIRV_Cross_textureSize(uSampler1DFloat, uint(0), _32_dummy_parameter));
+    a = int(spvTextureSize(uSampler1DFloat, uint(0), _32_dummy_parameter));
     uint _42_dummy_parameter;
-    int3 c = int3(SPIRV_Cross_textureSize(uSampler2DArray, uint(0), _42_dummy_parameter));
+    int3 c = int3(spvTextureSize(uSampler2DArray, uint(0), _42_dummy_parameter));
     uint _50_dummy_parameter;
-    int3 d = int3(SPIRV_Cross_textureSize(uSampler3D, uint(0), _50_dummy_parameter));
+    int3 d = int3(spvTextureSize(uSampler3D, uint(0), _50_dummy_parameter));
     uint _60_dummy_parameter;
-    int2 e = int2(SPIRV_Cross_textureSize(uSamplerCube, uint(0), _60_dummy_parameter));
+    int2 e = int2(spvTextureSize(uSamplerCube, uint(0), _60_dummy_parameter));
     uint _68_dummy_parameter;
-    int3 f = int3(SPIRV_Cross_textureSize(uSamplerCubeArray, uint(0), _68_dummy_parameter));
+    int3 f = int3(spvTextureSize(uSamplerCubeArray, uint(0), _68_dummy_parameter));
     uint _76_dummy_parameter;
-    int g = int(SPIRV_Cross_textureSize(uSamplerBuffer, 0u, _76_dummy_parameter));
+    int g = int(spvTextureSize(uSamplerBuffer, 0u, _76_dummy_parameter));
     uint _84_dummy_parameter;
-    int2 h = int2(SPIRV_Cross_textureSize(uSamplerMS, 0u, _84_dummy_parameter));
+    int2 h = int2(spvTextureSize(uSamplerMS, 0u, _84_dummy_parameter));
     uint _92_dummy_parameter;
-    int3 i = int3(SPIRV_Cross_textureSize(uSamplerMSArray, 0u, _92_dummy_parameter));
+    int3 i = int3(spvTextureSize(uSamplerMSArray, 0u, _92_dummy_parameter));
     int _100;
-    SPIRV_Cross_textureSize(uSampler2D, 0u, _100);
+    spvTextureSize(uSampler2D, 0u, _100);
     int l1 = int(_100);
     int _104;
-    SPIRV_Cross_textureSize(uSampler2DArray, 0u, _104);
+    spvTextureSize(uSampler2DArray, 0u, _104);
     int l2 = int(_104);
     int _108;
-    SPIRV_Cross_textureSize(uSampler3D, 0u, _108);
+    spvTextureSize(uSampler3D, 0u, _108);
     int l3 = int(_108);
     int _112;
-    SPIRV_Cross_textureSize(uSamplerCube, 0u, _112);
+    spvTextureSize(uSamplerCube, 0u, _112);
     int l4 = int(_112);
     int _116;
-    SPIRV_Cross_textureSize(uSamplerMS, 0u, _116);
+    spvTextureSize(uSamplerMS, 0u, _116);
     int s0 = int(_116);
     int _120;
-    SPIRV_Cross_textureSize(uSamplerMSArray, 0u, _120);
+    spvTextureSize(uSamplerMSArray, 0u, _120);
     int s1 = int(_120);
 }
 
diff --git a/reference/shaders-hlsl/frag/image-query-uav.frag b/reference/shaders-hlsl/frag/image-query-uav.frag
index 381a9557..6626ed2f 100644
--- a/reference/shaders-hlsl/frag/image-query-uav.frag
+++ b/reference/shaders-hlsl/frag/image-query-uav.frag
@@ -4,7 +4,7 @@ RWTexture2DArray<float> uImage2DArray : register(u2);
 RWTexture3D<unorm float4> uImage3D : register(u3);
 RWBuffer<snorm float4> uImageBuffer : register(u6);
 
-uint3 SPIRV_Cross_imageSize(RWTexture2DArray<float> Tex, out uint Param)
+uint3 spvImageSize(RWTexture2DArray<float> Tex, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(ret.x, ret.y, ret.z);
@@ -12,7 +12,7 @@ uint3 SPIRV_Cross_imageSize(RWTexture2DArray<float> Tex, out uint Param)
     return ret;
 }
 
-uint2 SPIRV_Cross_imageSize(RWTexture2D<float2> Tex, out uint Param)
+uint2 spvImageSize(RWTexture2D<float2> Tex, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(ret.x, ret.y);
@@ -20,7 +20,7 @@ uint2 SPIRV_Cross_imageSize(RWTexture2D<float2> Tex, out uint Param)
     return ret;
 }
 
-uint SPIRV_Cross_imageSize(RWTexture1D<float4> Tex, out uint Param)
+uint spvImageSize(RWTexture1D<float4> Tex, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -28,7 +28,7 @@ uint SPIRV_Cross_imageSize(RWTexture1D<float4> Tex, out uint Param)
     return ret;
 }
 
-uint3 SPIRV_Cross_imageSize(RWTexture3D<unorm float4> Tex, out uint Param)
+uint3 spvImageSize(RWTexture3D<unorm float4> Tex, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(ret.x, ret.y, ret.z);
@@ -36,7 +36,7 @@ uint3 SPIRV_Cross_imageSize(RWTexture3D<unorm float4> Tex, out uint Param)
     return ret;
 }
 
-uint SPIRV_Cross_imageSize(RWBuffer<snorm float4> Tex, out uint Param)
+uint spvImageSize(RWBuffer<snorm float4> Tex, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -47,15 +47,15 @@ uint SPIRV_Cross_imageSize(RWBuffer<snorm float4> Tex, out uint Param)
 void frag_main()
 {
     uint _14_dummy_parameter;
-    int a = int(SPIRV_Cross_imageSize(uImage1D, _14_dummy_parameter));
+    int a = int(spvImageSize(uImage1D, _14_dummy_parameter));
     uint _22_dummy_parameter;
-    int2 b = int2(SPIRV_Cross_imageSize(uImage2D, _22_dummy_parameter));
+    int2 b = int2(spvImageSize(uImage2D, _22_dummy_parameter));
     uint _30_dummy_parameter;
-    int3 c = int3(SPIRV_Cross_imageSize(uImage2DArray, _30_dummy_parameter));
+    int3 c = int3(spvImageSize(uImage2DArray, _30_dummy_parameter));
     uint _36_dummy_parameter;
-    int3 d = int3(SPIRV_Cross_imageSize(uImage3D, _36_dummy_parameter));
+    int3 d = int3(spvImageSize(uImage3D, _36_dummy_parameter));
     uint _42_dummy_parameter;
-    int e = int(SPIRV_Cross_imageSize(uImageBuffer, _42_dummy_parameter));
+    int e = int(spvImageSize(uImageBuffer, _42_dummy_parameter));
 }
 
 void main()
diff --git a/reference/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag b/reference/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag
index 5db5d359..1e77c2c9 100644
--- a/reference/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag
+++ b/reference/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag
@@ -4,14 +4,14 @@ Texture2DArray<float4> uImage2DArray : register(t2);
 RWTexture3D<unorm float4> uImage3D : register(u3);
 RWBuffer<snorm float4> uImageBuffer : register(u6);
 
-uint3 SPIRV_Cross_textureSize(Texture2DArray<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture2DArray<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint2 SPIRV_Cross_imageSize(RWTexture2D<float2> Tex, out uint Param)
+uint2 spvImageSize(RWTexture2D<float2> Tex, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(ret.x, ret.y);
@@ -19,7 +19,7 @@ uint2 SPIRV_Cross_imageSize(RWTexture2D<float2> Tex, out uint Param)
     return ret;
 }
 
-uint SPIRV_Cross_imageSize(RWTexture1D<float4> Tex, out uint Param)
+uint spvImageSize(RWTexture1D<float4> Tex, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -27,7 +27,7 @@ uint SPIRV_Cross_imageSize(RWTexture1D<float4> Tex, out uint Param)
     return ret;
 }
 
-uint3 SPIRV_Cross_imageSize(RWTexture3D<unorm float4> Tex, out uint Param)
+uint3 spvImageSize(RWTexture3D<unorm float4> Tex, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(ret.x, ret.y, ret.z);
@@ -35,7 +35,7 @@ uint3 SPIRV_Cross_imageSize(RWTexture3D<unorm float4> Tex, out uint Param)
     return ret;
 }
 
-uint SPIRV_Cross_imageSize(RWBuffer<snorm float4> Tex, out uint Param)
+uint spvImageSize(RWBuffer<snorm float4> Tex, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -46,15 +46,15 @@ uint SPIRV_Cross_imageSize(RWBuffer<snorm float4> Tex, out uint Param)
 void frag_main()
 {
     uint _14_dummy_parameter;
-    int a = int(SPIRV_Cross_imageSize(uImage1D, _14_dummy_parameter));
+    int a = int(spvImageSize(uImage1D, _14_dummy_parameter));
     uint _22_dummy_parameter;
-    int2 b = int2(SPIRV_Cross_imageSize(uImage2D, _22_dummy_parameter));
+    int2 b = int2(spvImageSize(uImage2D, _22_dummy_parameter));
     uint _30_dummy_parameter;
-    int3 c = int3(SPIRV_Cross_textureSize(uImage2DArray, 0u, _30_dummy_parameter));
+    int3 c = int3(spvTextureSize(uImage2DArray, 0u, _30_dummy_parameter));
     uint _36_dummy_parameter;
-    int3 d = int3(SPIRV_Cross_imageSize(uImage3D, _36_dummy_parameter));
+    int3 d = int3(spvImageSize(uImage3D, _36_dummy_parameter));
     uint _42_dummy_parameter;
-    int e = int(SPIRV_Cross_imageSize(uImageBuffer, _42_dummy_parameter));
+    int e = int(spvImageSize(uImageBuffer, _42_dummy_parameter));
 }
 
 void main()
diff --git a/reference/shaders-hlsl/frag/image-query.frag b/reference/shaders-hlsl/frag/image-query.frag
index 71cefc10..0e4b26ba 100644
--- a/reference/shaders-hlsl/frag/image-query.frag
+++ b/reference/shaders-hlsl/frag/image-query.frag
@@ -16,35 +16,35 @@ SamplerState _uSamplerMS_sampler : register(s7);
 Texture2DMSArray<float4> uSamplerMSArray : register(t8);
 SamplerState _uSamplerMSArray_sampler : register(s8);
 
-uint SPIRV_Cross_textureSize(Texture1D<float4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Texture1D<float4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(Level, ret.x, Param);
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(Texture2D<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2D<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture2DArray<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture2DArray<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture3D<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture3D<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint SPIRV_Cross_textureSize(Buffer<float4> Tex, uint Level, out uint Param)
+uint spvTextureSize(Buffer<float4> Tex, uint Level, out uint Param)
 {
     uint ret;
     Tex.GetDimensions(ret.x);
@@ -52,28 +52,28 @@ uint SPIRV_Cross_textureSize(Buffer<float4> Tex, uint Level, out uint Param)
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(TextureCube<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(TextureCube<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(TextureCubeArray<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(TextureCubeArray<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, ret.z, Param);
     return ret;
 }
 
-uint2 SPIRV_Cross_textureSize(Texture2DMS<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2DMS<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(ret.x, ret.y, Param);
     return ret;
 }
 
-uint3 SPIRV_Cross_textureSize(Texture2DMSArray<float4> Tex, uint Level, out uint Param)
+uint3 spvTextureSize(Texture2DMSArray<float4> Tex, uint Level, out uint Param)
 {
     uint3 ret;
     Tex.GetDimensions(ret.x, ret.y, ret.z, Param);
@@ -83,46 +83,46 @@ uint3 SPIRV_Cross_textureSize(Texture2DMSArray<float4> Tex, uint Level, out uint
 void frag_main()
 {
     uint _17_dummy_parameter;
-    int a = int(SPIRV_Cross_textureSize(uSampler1D, uint(0), _17_dummy_parameter));
+    int a = int(spvTextureSize(uSampler1D, uint(0), _17_dummy_parameter));
     uint _27_dummy_parameter;
-    int2 b = int2(SPIRV_Cross_textureSize(uSampler2D, uint(0), _27_dummy_parameter));
+    int2 b = int2(spvTextureSize(uSampler2D, uint(0), _27_dummy_parameter));
     uint _37_dummy_parameter;
-    int3 c = int3(SPIRV_Cross_textureSize(uSampler2DArray, uint(0), _37_dummy_parameter));
+    int3 c = int3(spvTextureSize(uSampler2DArray, uint(0), _37_dummy_parameter));
     uint _45_dummy_parameter;
-    int3 d = int3(SPIRV_Cross_textureSize(uSampler3D, uint(0), _45_dummy_parameter));
+    int3 d = int3(spvTextureSize(uSampler3D, uint(0), _45_dummy_parameter));
     uint _53_dummy_parameter;
-    int2 e = int2(SPIRV_Cross_textureSize(uSamplerCube, uint(0), _53_dummy_parameter));
+    int2 e = int2(spvTextureSize(uSamplerCube, uint(0), _53_dummy_parameter));
     uint _61_dummy_parameter;
-    int3 f = int3(SPIRV_Cross_textureSize(uSamplerCubeArray, uint(0), _61_dummy_parameter));
+    int3 f = int3(spvTextureSize(uSamplerCubeArray, uint(0), _61_dummy_parameter));
     uint _69_dummy_parameter;
-    int g = int(SPIRV_Cross_textureSize(uSamplerBuffer, 0u, _69_dummy_parameter));
+    int g = int(spvTextureSize(uSamplerBuffer, 0u, _69_dummy_parameter));
     uint _77_dummy_parameter;
-    int2 h = int2(SPIRV_Cross_textureSize(uSamplerMS, 0u, _77_dummy_parameter));
+    int2 h = int2(spvTextureSize(uSamplerMS, 0u, _77_dummy_parameter));
     uint _85_dummy_parameter;
-    int3 i = int3(SPIRV_Cross_textureSize(uSamplerMSArray, 0u, _85_dummy_parameter));
+    int3 i = int3(spvTextureSize(uSamplerMSArray, 0u, _85_dummy_parameter));
     int _89;
-    SPIRV_Cross_textureSize(uSampler1D, 0u, _89);
+    spvTextureSize(uSampler1D, 0u, _89);
     int l0 = int(_89);
     int _93;
-    SPIRV_Cross_textureSize(uSampler2D, 0u, _93);
+    spvTextureSize(uSampler2D, 0u, _93);
     int l1 = int(_93);
     int _97;
-    SPIRV_Cross_textureSize(uSampler2DArray, 0u, _97);
+    spvTextureSize(uSampler2DArray, 0u, _97);
     int l2 = int(_97);
     int _101;
-    SPIRV_Cross_textureSize(uSampler3D, 0u, _101);
+    spvTextureSize(uSampler3D, 0u, _101);
     int l3 = int(_101);
     int _105;
-    SPIRV_Cross_textureSize(uSamplerCube, 0u, _105);
+    spvTextureSize(uSamplerCube, 0u, _105);
     int l4 = int(_105);
     int _109;
-    SPIRV_Cross_textureSize(uSamplerCubeArray, 0u, _109);
+    spvTextureSize(uSamplerCubeArray, 0u, _109);
     int l5 = int(_109);
     int _113;
-    SPIRV_Cross_textureSize(uSamplerMS, 0u, _113);
+    spvTextureSize(uSamplerMS, 0u, _113);
     int s0 = int(_113);
     int _117;
-    SPIRV_Cross_textureSize(uSamplerMSArray, 0u, _117);
+    spvTextureSize(uSamplerMSArray, 0u, _117);
     int s1 = int(_117);
 }
 
diff --git a/reference/shaders-hlsl/frag/scalar-refract-reflect.frag b/reference/shaders-hlsl/frag/scalar-refract-reflect.frag
index 0fb694c5..6c2d0be4 100644
--- a/reference/shaders-hlsl/frag/scalar-refract-reflect.frag
+++ b/reference/shaders-hlsl/frag/scalar-refract-reflect.frag
@@ -11,12 +11,12 @@ struct SPIRV_Cross_Output
     float FragColor : SV_Target0;
 };
 
-float SPIRV_Cross_Reflect(float i, float n)
+float spvReflect(float i, float n)
 {
     return i - 2.0 * dot(n, i) * n;
 }
 
-float SPIRV_Cross_Refract(float i, float n, float eta)
+float spvRefract(float i, float n, float eta)
 {
     float NoI = n * i;
     float NoI2 = NoI * NoI;
@@ -33,8 +33,8 @@ float SPIRV_Cross_Refract(float i, float n, float eta)
 
 void frag_main()
 {
-    FragColor = SPIRV_Cross_Refract(vRefract.x, vRefract.y, vRefract.z);
-    FragColor += SPIRV_Cross_Reflect(vRefract.x, vRefract.y);
+    FragColor = spvRefract(vRefract.x, vRefract.y, vRefract.z);
+    FragColor += spvReflect(vRefract.x, vRefract.y);
     FragColor += refract(vRefract.xy, vRefract.yz, vRefract.z).y;
     FragColor += reflect(vRefract.xy, vRefract.zy).y;
 }
diff --git a/reference/shaders-hlsl/frag/texture-size-combined-image-sampler.frag b/reference/shaders-hlsl/frag/texture-size-combined-image-sampler.frag
index d5c37374..dd2eb251 100644
--- a/reference/shaders-hlsl/frag/texture-size-combined-image-sampler.frag
+++ b/reference/shaders-hlsl/frag/texture-size-combined-image-sampler.frag
@@ -8,7 +8,7 @@ struct SPIRV_Cross_Output
     int2 FooOut : SV_Target0;
 };
 
-uint2 SPIRV_Cross_textureSize(Texture2D<float4> Tex, uint Level, out uint Param)
+uint2 spvTextureSize(Texture2D<float4> Tex, uint Level, out uint Param)
 {
     uint2 ret;
     Tex.GetDimensions(Level, ret.x, ret.y, Param);
@@ -18,7 +18,7 @@ uint2 SPIRV_Cross_textureSize(Texture2D<float4> Tex, uint Level, out uint Param)
 void frag_main()
 {
     uint _23_dummy_parameter;
-    FooOut = int2(SPIRV_Cross_textureSize(uTex, uint(0), _23_dummy_parameter));
+    FooOut = int2(spvTextureSize(uTex, uint(0), _23_dummy_parameter));
 }
 
 SPIRV_Cross_Output main()
diff --git a/reference/shaders-hlsl/frag/unorm-snorm-packing.frag b/reference/shaders-hlsl/frag/unorm-snorm-packing.frag
index 57b59506..0dd9ed3f 100644
--- a/reference/shaders-hlsl/frag/unorm-snorm-packing.frag
+++ b/reference/shaders-hlsl/frag/unorm-snorm-packing.frag
@@ -27,50 +27,50 @@ struct SPIRV_Cross_Output
     uint SNORM16Out : SV_Target4;
 };
 
-uint SPIRV_Cross_packUnorm4x8(float4 value)
+uint spvPackUnorm4x8(float4 value)
 {
     uint4 Packed = uint4(round(saturate(value) * 255.0));
     return Packed.x | (Packed.y << 8) | (Packed.z << 16) | (Packed.w << 24);
 }
 
-float4 SPIRV_Cross_unpackUnorm4x8(uint value)
+float4 spvUnpackUnorm4x8(uint value)
 {
     uint4 Packed = uint4(value & 0xff, (value >> 8) & 0xff, (value >> 16) & 0xff, value >> 24);
     return float4(Packed) / 255.0;
 }
 
-uint SPIRV_Cross_packSnorm4x8(float4 value)
+uint spvPackSnorm4x8(float4 value)
 {
     int4 Packed = int4(round(clamp(value, -1.0, 1.0) * 127.0)) & 0xff;
     return uint(Packed.x | (Packed.y << 8) | (Packed.z << 16) | (Packed.w << 24));
 }
 
-float4 SPIRV_Cross_unpackSnorm4x8(uint value)
+float4 spvUnpackSnorm4x8(uint value)
 {
     int SignedValue = int(value);
     int4 Packed = int4(SignedValue << 24, SignedValue << 16, SignedValue << 8, SignedValue) >> 24;
     return clamp(float4(Packed) / 127.0, -1.0, 1.0);
 }
 
-uint SPIRV_Cross_packUnorm2x16(float2 value)
+uint spvPackUnorm2x16(float2 value)
 {
     uint2 Packed = uint2(round(saturate(value) * 65535.0));
     return Packed.x | (Packed.y << 16);
 }
 
-float2 SPIRV_Cross_unpackUnorm2x16(uint value)
+float2 spvUnpackUnorm2x16(uint value)
 {
     uint2 Packed = uint2(value & 0xffff, value >> 16);
     return float2(Packed) / 65535.0;
 }
 
-uint SPIRV_Cross_packSnorm2x16(float2 value)
+uint spvPackSnorm2x16(float2 value)
 {
     int2 Packed = int2(round(clamp(value, -1.0, 1.0) * 32767.0)) & 0xffff;
     return uint(Packed.x | (Packed.y << 16));
 }
 
-float2 SPIRV_Cross_unpackSnorm2x16(uint value)
+float2 spvUnpackSnorm2x16(uint value)
 {
     int SignedValue = int(value);
     int2 Packed = int2(SignedValue << 16, SignedValue) >> 16;
@@ -79,16 +79,16 @@ float2 SPIRV_Cross_unpackSnorm2x16(uint value)
 
 void frag_main()
 {
-    FP32Out = SPIRV_Cross_unpackUnorm4x8(UNORM8);
-    FP32Out = SPIRV_Cross_unpackSnorm4x8(SNORM8);
-    float2 _21 = SPIRV_Cross_unpackUnorm2x16(UNORM16);
+    FP32Out = spvUnpackUnorm4x8(UNORM8);
+    FP32Out = spvUnpackSnorm4x8(SNORM8);
+    float2 _21 = spvUnpackUnorm2x16(UNORM16);
     FP32Out = float4(_21.x, _21.y, FP32Out.z, FP32Out.w);
-    float2 _26 = SPIRV_Cross_unpackSnorm2x16(SNORM16);
+    float2 _26 = spvUnpackSnorm2x16(SNORM16);
     FP32Out = float4(_26.x, _26.y, FP32Out.z, FP32Out.w);
-    UNORM8Out = SPIRV_Cross_packUnorm4x8(FP32);
-    SNORM8Out = SPIRV_Cross_packSnorm4x8(FP32);
-    UNORM16Out = SPIRV_Cross_packUnorm2x16(FP32.xy);
-    SNORM16Out = SPIRV_Cross_packSnorm2x16(FP32.zw);
+    UNORM8Out = spvPackUnorm4x8(FP32);
+    SNORM8Out = spvPackSnorm4x8(FP32);
+    UNORM16Out = spvPackUnorm2x16(FP32.xy);
+    SNORM16Out = spvPackSnorm2x16(FP32.zw);
 }
 
 SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
diff --git a/reference/shaders-hlsl/vert/return-array.vert b/reference/shaders-hlsl/vert/return-array.vert
index 83e3a281..3e021257 100644
--- a/reference/shaders-hlsl/vert/return-array.vert
+++ b/reference/shaders-hlsl/vert/return-array.vert
@@ -15,17 +15,17 @@ struct SPIRV_Cross_Output
     float4 gl_Position : SV_Position;
 };
 
-void test(out float4 SPIRV_Cross_return_value[2])
+void test(out float4 spvReturnValue[2])
 {
-    SPIRV_Cross_return_value = _20;
+    spvReturnValue = _20;
 }
 
-void test2(out float4 SPIRV_Cross_return_value[2])
+void test2(out float4 spvReturnValue[2])
 {
     float4 foobar[2];
     foobar[0] = vInput0;
     foobar[1] = vInput1;
-    SPIRV_Cross_return_value = foobar;
+    spvReturnValue = foobar;
 }
 
 void vert_main()