MSL: Fix var names in test shaders to avoid reserved identifiers.

9 files changed, 129 insertions, 129 deletions

diff --git a/reference/opt/shaders-msl/tese/in-block-with-nested-struct.tese b/reference/opt/shaders-msl/tese/in-block-with-nested-struct.tese
index f177debf..52e4d56f 100644
--- a/reference/opt/shaders-msl/tese/in-block-with-nested-struct.tese
+++ b/reference/opt/shaders-msl/tese/in-block-with-nested-struct.tese
@@ -3,29 +3,29 @@
 
 using namespace metal;
 
-struct _RESERVED_IDENTIFIER_FIXUP_35
+struct t35
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float2 m0;
+    float4 m1;
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_36
+struct t36
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_m0;
-    _RESERVED_IDENTIFIER_FIXUP_35 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float2 m0;
+    t35 m1;
 };
 
 struct main0_out
 {
-    float _RESERVED_IDENTIFIER_FIXUP_80 [[user(locn0)]];
+    float v80 [[user(locn0)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m0 [[attribute(0)]];
-    float2 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m0 [[attribute(1)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1 [[attribute(2)]];
+    float2 t36_m0 [[attribute(0)]];
+    float2 t36_m1_m0 [[attribute(1)]];
+    float4 t36_m1_m1 [[attribute(2)]];
 };
 
 struct main0_patchIn
@@ -37,7 +37,7 @@ struct main0_patchIn
 {
     main0_out out = {};
     out.gl_Position = float4((gl_TessCoord.xy * 2.0) - float2(1.0), 0.0, 1.0);
-    out._RESERVED_IDENTIFIER_FIXUP_80 = ((float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.w - 7.0) < 0.001000000047497451305389404296875);
+    out.v80 = ((float(abs(patchIn.gl_in[0].t36_m1_m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(patchIn.gl_in[0].t36_m1_m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0].t36_m1_m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0].t36_m1_m1.w - 7.0) < 0.001000000047497451305389404296875);
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/vert/out-block-with-nested-struct-array.vert b/reference/opt/shaders-msl/vert/out-block-with-nested-struct-array.vert
index 5a42d8d8..08f038fd 100644
--- a/reference/opt/shaders-msl/vert/out-block-with-nested-struct-array.vert
+++ b/reference/opt/shaders-msl/vert/out-block-with-nested-struct-array.vert
@@ -44,45 +44,45 @@ struct spvUnsafeArray
     }
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_21
+struct t21
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float4 m0;
+    float4 m1;
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_24
+struct t24
 {
-    spvUnsafeArray<_RESERVED_IDENTIFIER_FIXUP_21, 3> _RESERVED_IDENTIFIER_FIXUP_m0;
+    spvUnsafeArray<t21, 3> m0;
 };
 
 struct main0_out
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn0)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn1)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn2)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn3)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn4)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn5)]];
+    float4 t24_m0_0_m0 [[user(locn0)]];
+    float4 t24_m0_0_m1 [[user(locn1)]];
+    float4 t24_m0_1_m0 [[user(locn2)]];
+    float4 t24_m0_1_m1 [[user(locn3)]];
+    float4 t24_m0_2_m0 [[user(locn4)]];
+    float4 t24_m0_2_m1 [[user(locn5)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_17 [[attribute(0)]];
+    float4 v17 [[attribute(0)]];
 };
 
 vertex main0_out main0(main0_in in [[stage_in]])
 {
     main0_out out = {};
-    _RESERVED_IDENTIFIER_FIXUP_24 _RESERVED_IDENTIFIER_FIXUP_26 = {};
-    out.gl_Position = in._RESERVED_IDENTIFIER_FIXUP_17;
-    _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m1 = float4(-4.0, -9.0, 3.0, 7.0);
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[0]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[0]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[2]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[2]._RESERVED_IDENTIFIER_FIXUP_m1;
+    t24 v26 = {};
+    out.gl_Position = in.v17;
+    v26.m0[1].m1 = float4(-4.0, -9.0, 3.0, 7.0);
+    out.t24_m0_0_m0 = v26.m0[0].m0;
+    out.t24_m0_0_m1 = v26.m0[0].m1;
+    out.t24_m0_1_m0 = v26.m0[1].m0;
+    out.t24_m0_1_m1 = v26.m0[1].m1;
+    out.t24_m0_2_m0 = v26.m0[2].m0;
+    out.t24_m0_2_m1 = v26.m0[2].m1;
     return out;
 }
 
diff --git a/reference/opt/shaders-msl/vert/out-block-with-struct-array.vert b/reference/opt/shaders-msl/vert/out-block-with-struct-array.vert
index d9a35c4f..984917b9 100644
--- a/reference/opt/shaders-msl/vert/out-block-with-struct-array.vert
+++ b/reference/opt/shaders-msl/vert/out-block-with-struct-array.vert
@@ -44,40 +44,40 @@ struct spvUnsafeArray
     }
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_21
+struct t21
 {
-    float _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float m0;
+    float4 m1;
 };
 
 struct main0_out
 {
-    float _RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn0)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn1)]];
-    float _RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn2)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn3)]];
-    float _RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn4)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn5)]];
+    float t21_0_m0 [[user(locn0)]];
+    float4 t21_0_m1 [[user(locn1)]];
+    float t21_1_m0 [[user(locn2)]];
+    float4 t21_1_m1 [[user(locn3)]];
+    float t21_2_m0 [[user(locn4)]];
+    float4 t21_2_m1 [[user(locn5)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_17 [[attribute(0)]];
+    float4 v17 [[attribute(0)]];
 };
 
 vertex main0_out main0(main0_in in [[stage_in]])
 {
     main0_out out = {};
-    spvUnsafeArray<_RESERVED_IDENTIFIER_FIXUP_21, 3> _RESERVED_IDENTIFIER_FIXUP_25 = {};
-    out.gl_Position = in._RESERVED_IDENTIFIER_FIXUP_17;
-    _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m1 = float4(-4.0, -9.0, 3.0, 7.0);
-    out._RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[0]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[0]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[1]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[1]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m1;
+    spvUnsafeArray<t21, 3> v25 = {};
+    out.gl_Position = in.v17;
+    v25[2].m1 = float4(-4.0, -9.0, 3.0, 7.0);
+    out.t21_0_m0 = v25[0].m0;
+    out.t21_0_m1 = v25[0].m1;
+    out.t21_1_m0 = v25[1].m0;
+    out.t21_1_m1 = v25[1].m1;
+    out.t21_2_m0 = v25[2].m0;
+    out.t21_2_m1 = v25[2].m1;
     return out;
 }
 
diff --git a/reference/shaders-msl/tese/in-block-with-nested-struct.tese b/reference/shaders-msl/tese/in-block-with-nested-struct.tese
index 097df3bd..28a68400 100644
--- a/reference/shaders-msl/tese/in-block-with-nested-struct.tese
+++ b/reference/shaders-msl/tese/in-block-with-nested-struct.tese
@@ -3,29 +3,29 @@
 
 using namespace metal;
 
-struct _RESERVED_IDENTIFIER_FIXUP_35
+struct t35
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float2 m0;
+    float4 m1;
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_36
+struct t36
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_m0;
-    _RESERVED_IDENTIFIER_FIXUP_35 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float2 m0;
+    t35 m1;
 };
 
 struct main0_out
 {
-    float _RESERVED_IDENTIFIER_FIXUP_80 [[user(locn0)]];
+    float v80 [[user(locn0)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float2 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m0 [[attribute(0)]];
-    float2 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m0 [[attribute(1)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1 [[attribute(2)]];
+    float2 t36_m0 [[attribute(0)]];
+    float2 t36_m1_m0 [[attribute(1)]];
+    float4 t36_m1_m1 [[attribute(2)]];
 };
 
 struct main0_patchIn
@@ -37,8 +37,8 @@ struct main0_patchIn
 {
     main0_out out = {};
     out.gl_Position = float4((gl_TessCoord.xy * 2.0) - float2(1.0), 0.0, 1.0);
-    float _RESERVED_IDENTIFIER_FIXUP_34 = ((float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0]._RESERVED_IDENTIFIER_FIXUP_36_RESERVED_IDENTIFIER_FIXUP_m1_RESERVED_IDENTIFIER_FIXUP_m1.w - 7.0) < 0.001000000047497451305389404296875);
-    out._RESERVED_IDENTIFIER_FIXUP_80 = _RESERVED_IDENTIFIER_FIXUP_34;
+    float v34 = ((float(abs(patchIn.gl_in[0].t36_m1_m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(patchIn.gl_in[0].t36_m1_m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0].t36_m1_m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(patchIn.gl_in[0].t36_m1_m1.w - 7.0) < 0.001000000047497451305389404296875);
+    out.v80 = v34;
     return out;
 }
 
diff --git a/reference/shaders-msl/vert/out-block-with-nested-struct-array.vert b/reference/shaders-msl/vert/out-block-with-nested-struct-array.vert
index 5a42d8d8..08f038fd 100644
--- a/reference/shaders-msl/vert/out-block-with-nested-struct-array.vert
+++ b/reference/shaders-msl/vert/out-block-with-nested-struct-array.vert
@@ -44,45 +44,45 @@ struct spvUnsafeArray
     }
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_21
+struct t21
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float4 m0;
+    float4 m1;
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_24
+struct t24
 {
-    spvUnsafeArray<_RESERVED_IDENTIFIER_FIXUP_21, 3> _RESERVED_IDENTIFIER_FIXUP_m0;
+    spvUnsafeArray<t21, 3> m0;
 };
 
 struct main0_out
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn0)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn1)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn2)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn3)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn4)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn5)]];
+    float4 t24_m0_0_m0 [[user(locn0)]];
+    float4 t24_m0_0_m1 [[user(locn1)]];
+    float4 t24_m0_1_m0 [[user(locn2)]];
+    float4 t24_m0_1_m1 [[user(locn3)]];
+    float4 t24_m0_2_m0 [[user(locn4)]];
+    float4 t24_m0_2_m1 [[user(locn5)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_17 [[attribute(0)]];
+    float4 v17 [[attribute(0)]];
 };
 
 vertex main0_out main0(main0_in in [[stage_in]])
 {
     main0_out out = {};
-    _RESERVED_IDENTIFIER_FIXUP_24 _RESERVED_IDENTIFIER_FIXUP_26 = {};
-    out.gl_Position = in._RESERVED_IDENTIFIER_FIXUP_17;
-    _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m1 = float4(-4.0, -9.0, 3.0, 7.0);
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[0]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_0_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[0]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_1_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[1]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[2]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_24_RESERVED_IDENTIFIER_FIXUP_m0_2_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_26._RESERVED_IDENTIFIER_FIXUP_m0[2]._RESERVED_IDENTIFIER_FIXUP_m1;
+    t24 v26 = {};
+    out.gl_Position = in.v17;
+    v26.m0[1].m1 = float4(-4.0, -9.0, 3.0, 7.0);
+    out.t24_m0_0_m0 = v26.m0[0].m0;
+    out.t24_m0_0_m1 = v26.m0[0].m1;
+    out.t24_m0_1_m0 = v26.m0[1].m0;
+    out.t24_m0_1_m1 = v26.m0[1].m1;
+    out.t24_m0_2_m0 = v26.m0[2].m0;
+    out.t24_m0_2_m1 = v26.m0[2].m1;
     return out;
 }
 
diff --git a/reference/shaders-msl/vert/out-block-with-struct-array.vert b/reference/shaders-msl/vert/out-block-with-struct-array.vert
index d9a35c4f..984917b9 100644
--- a/reference/shaders-msl/vert/out-block-with-struct-array.vert
+++ b/reference/shaders-msl/vert/out-block-with-struct-array.vert
@@ -44,40 +44,40 @@ struct spvUnsafeArray
     }
 };
 
-struct _RESERVED_IDENTIFIER_FIXUP_21
+struct t21
 {
-    float _RESERVED_IDENTIFIER_FIXUP_m0;
-    float4 _RESERVED_IDENTIFIER_FIXUP_m1;
+    float m0;
+    float4 m1;
 };
 
 struct main0_out
 {
-    float _RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn0)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn1)]];
-    float _RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn2)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn3)]];
-    float _RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m0 [[user(locn4)]];
-    float4 _RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m1 [[user(locn5)]];
+    float t21_0_m0 [[user(locn0)]];
+    float4 t21_0_m1 [[user(locn1)]];
+    float t21_1_m0 [[user(locn2)]];
+    float4 t21_1_m1 [[user(locn3)]];
+    float t21_2_m0 [[user(locn4)]];
+    float4 t21_2_m1 [[user(locn5)]];
     float4 gl_Position [[position]];
 };
 
 struct main0_in
 {
-    float4 _RESERVED_IDENTIFIER_FIXUP_17 [[attribute(0)]];
+    float4 v17 [[attribute(0)]];
 };
 
 vertex main0_out main0(main0_in in [[stage_in]])
 {
     main0_out out = {};
-    spvUnsafeArray<_RESERVED_IDENTIFIER_FIXUP_21, 3> _RESERVED_IDENTIFIER_FIXUP_25 = {};
-    out.gl_Position = in._RESERVED_IDENTIFIER_FIXUP_17;
-    _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m1 = float4(-4.0, -9.0, 3.0, 7.0);
-    out._RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[0]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_0_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[0]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[1]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_1_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[1]._RESERVED_IDENTIFIER_FIXUP_m1;
-    out._RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m0 = _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m0;
-    out._RESERVED_IDENTIFIER_FIXUP_21_2_RESERVED_IDENTIFIER_FIXUP_m1 = _RESERVED_IDENTIFIER_FIXUP_25[2]._RESERVED_IDENTIFIER_FIXUP_m1;
+    spvUnsafeArray<t21, 3> v25 = {};
+    out.gl_Position = in.v17;
+    v25[2].m1 = float4(-4.0, -9.0, 3.0, 7.0);
+    out.t21_0_m0 = v25[0].m0;
+    out.t21_0_m1 = v25[0].m1;
+    out.t21_1_m0 = v25[1].m0;
+    out.t21_1_m1 = v25[1].m1;
+    out.t21_2_m0 = v25[2].m0;
+    out.t21_2_m1 = v25[2].m1;
     return out;
 }
 
diff --git a/shaders-msl/tese/in-block-with-nested-struct.tese b/shaders-msl/tese/in-block-with-nested-struct.tese
index 6a41d274..629415a8 100644
--- a/shaders-msl/tese/in-block-with-nested-struct.tese
+++ b/shaders-msl/tese/in-block-with-nested-struct.tese
@@ -9,23 +9,23 @@ out gl_PerVertex
     float gl_CullDistance[1];
 };
 
-struct _35
+struct t35
 {
-    vec2 _m0;
-    vec4 _m1;
+    vec2 m0;
+    vec4 m1;
 };
 
-layout(location = 0) in _36
+layout(location = 0) in t36
 {
-    vec2 _m0;
-    _35 _m1;
-} _40[32];
+    vec2 m0;
+    t35 m1;
+} v40[32];
 
-layout(location = 0) out float _80;
+layout(location = 0) out float v80;
 
 void main()
 {
     gl_Position = vec4((gl_TessCoord.xy * 2.0) - vec2(1.0), 0.0, 1.0);
-    float _34 = ((float(abs(_40[0]._m1._m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(_40[0]._m1._m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(_40[0]._m1._m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(_40[0]._m1._m1.w - 7.0) < 0.001000000047497451305389404296875);
-    _80 = _34;
+    float v34 = ((float(abs(v40[0].m1.m1.x - (-4.0)) < 0.001000000047497451305389404296875) * float(abs(v40[0].m1.m1.y - (-9.0)) < 0.001000000047497451305389404296875)) * float(abs(v40[0].m1.m1.z - 3.0) < 0.001000000047497451305389404296875)) * float(abs(v40[0].m1.m1.w - 7.0) < 0.001000000047497451305389404296875);
+    v80 = v34;
 }
diff --git a/shaders-msl/vert/out-block-with-nested-struct-array.vert b/shaders-msl/vert/out-block-with-nested-struct-array.vert
index 592a5271..444e7ca9 100644
--- a/shaders-msl/vert/out-block-with-nested-struct-array.vert
+++ b/shaders-msl/vert/out-block-with-nested-struct-array.vert
@@ -8,21 +8,21 @@ out gl_PerVertex
     float gl_CullDistance[1];
 };
 
-struct _21
+struct t21
 {
-    vec4 _m0;
-    vec4 _m1;
+    vec4 m0;
+    vec4 m1;
 };
 
-layout(location = 0) in vec4 _17;
-layout(location = 0) out _24
+layout(location = 0) in vec4 v17;
+layout(location = 0) out t24
 {
-    _21 _m0[3];
-} _26;
+    t21 m0[3];
+} v26;
 
 
 void main()
 {
-    gl_Position = _17;
-    _26._m0[1]._m1 = vec4(-4.0, -9.0, 3.0, 7.0);
+    gl_Position = v17;
+    v26.m0[1].m1 = vec4(-4.0, -9.0, 3.0, 7.0);
 }
diff --git a/shaders-msl/vert/out-block-with-struct-array.vert b/shaders-msl/vert/out-block-with-struct-array.vert
index 8b8029f7..2cb13b30 100644
--- a/shaders-msl/vert/out-block-with-struct-array.vert
+++ b/shaders-msl/vert/out-block-with-struct-array.vert
@@ -8,17 +8,17 @@ out gl_PerVertex
     float gl_CullDistance[1];
 };
 
-struct _21
+struct t21
 {
-    float _m0;
-    vec4 _m1;
+    float m0;
+    vec4 m1;
 };
 
-layout(location = 0) in vec4 _17;
-layout(location = 0) out _21 _25[3];
+layout(location = 0) in vec4 v17;
+layout(location = 0) out t21 v25[3];
 
 void main()
 {
-    gl_Position = _17;
-    _25[2]._m1 = vec4(-4.0, -9.0, 3.0, 7.0);
+    gl_Position = v17;
+    v25[2].m1 = vec4(-4.0, -9.0, 3.0, 7.0);
 }