diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc
index e2c103cf61..d731ec13e4 100644
--- a/src/writer/msl/generator_impl.cc
+++ b/src/writer/msl/generator_impl.cc
@@ -2304,12 +2304,12 @@ bool GeneratorImpl::EmitStorageClass(std::ostream& out, ast::StorageClass sc) {
 bool GeneratorImpl::EmitPackedType(std::ostream& out,
                                    const sem::Type* type,
                                    const std::string& name) {
-  if (auto* vec = type->As<sem::Vector>()) {
+  auto* vec = type->As<sem::Vector>();
+  if (vec && vec->Width() == 3) {
     out << "packed_";
-    if (!EmitType(out, vec->type(), "")) {
+    if (!EmitType(out, vec, "")) {
       return false;
     }
-    out << vec->Width();
     return true;
   }
 
@@ -2634,7 +2634,6 @@ bool GeneratorImpl::EmitProgramConstVariable(const ast::Variable* var) {
   return true;
 }
 
-// TODO(crbug.com/tint/898): We need CTS and / or Dawn e2e tests for this logic.
 GeneratorImpl::SizeAndAlign GeneratorImpl::MslPackedTypeSizeAndAlign(
     const sem::Type* ty) {
   if (ty->IsAnyOf<sem::U32, sem::I32, sem::F32>()) {
@@ -2644,12 +2643,19 @@ GeneratorImpl::SizeAndAlign GeneratorImpl::MslPackedTypeSizeAndAlign(
   }
 
   if (auto* vec = ty->As<sem::Vector>()) {
-    // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
-    // 2.2.3 Packed Vector Types
     auto num_els = vec->Width();
     auto* el_ty = vec->type();
     if (el_ty->IsAnyOf<sem::U32, sem::I32, sem::F32>()) {
-      return SizeAndAlign{num_els * 4, 4};
+      // Use a packed_vec type for 3-element vectors only.
+      if (num_els == 3) {
+        // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
+        // 2.2.3 Packed Vector Types
+        return SizeAndAlign{num_els * 4, 4};
+      } else {
+        // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
+        // 2.2 Vector Data Types
+        return SizeAndAlign{num_els * 4, num_els * 4};
+      }
     }
   }
 
diff --git a/src/writer/msl/generator_impl_function_test.cc b/src/writer/msl/generator_impl_function_test.cc
index 226c53ace5..af27b7999d 100644
--- a/src/writer/msl/generator_impl_function_test.cc
+++ b/src/writer/msl/generator_impl_function_test.cc
@@ -453,7 +453,7 @@ TEST_F(MslGeneratorImplTest,
 
 using namespace metal;
 struct UBO {
-  /* 0x0000 */ packed_float4 coord;
+  /* 0x0000 */ float4 coord;
 };
 
 float sub_func(constant UBO& ubo, float param) {
diff --git a/src/writer/msl/generator_impl_type_test.cc b/src/writer/msl/generator_impl_type_test.cc
index 073990ec24..6c44c3600b 100644
--- a/src/writer/msl/generator_impl_type_test.cc
+++ b/src/writer/msl/generator_impl_type_test.cc
@@ -46,9 +46,9 @@ using ::testing::HasSubstr;
 
 // Size and alignments taken from the MSL spec:
 // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
-DECLARE_TYPE(packed_float2, 8, 4);
+DECLARE_TYPE(float2, 8, 8);
 DECLARE_TYPE(packed_float3, 12, 4);
-DECLARE_TYPE(packed_float4, 16, 4);
+DECLARE_TYPE(float4, 16, 16);
 DECLARE_TYPE(float2x2, 16, 8);
 DECLARE_TYPE(float2x3, 32, 16);
 DECLARE_TYPE(float2x4, 32, 16);
@@ -282,12 +282,12 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_Layout_NonComposites) {
   FIELD(0x0004, int8_t, tint_pad, [124])         \
   FIELD(0x0080, float, b, /*NO SUFFIX*/)         \
   FIELD(0x0084, int8_t, tint_pad_1, [124])       \
-  FIELD(0x0100, packed_float2, c, /*NO SUFFIX*/) \
+  FIELD(0x0100, float2, c, /*NO SUFFIX*/)        \
   FIELD(0x0108, uint, d, /*NO SUFFIX*/)          \
   FIELD(0x010c, int8_t, tint_pad_2, [4])         \
   FIELD(0x0110, packed_float3, e, /*NO SUFFIX*/) \
   FIELD(0x011c, uint, f, /*NO SUFFIX*/)          \
-  FIELD(0x0120, packed_float4, g, /*NO SUFFIX*/) \
+  FIELD(0x0120, float4, g, /*NO SUFFIX*/)        \
   FIELD(0x0130, uint, h, /*NO SUFFIX*/)          \
   FIELD(0x0134, int8_t, tint_pad_3, [4])         \
   FIELD(0x0138, float2x2, i, /*NO SUFFIX*/)      \
@@ -633,12 +633,12 @@ TEST_F(MslGeneratorImplTest, AttemptTintPadSymbolCollision) {
   /* 0x0004 */ int8_t tint_pad_10[124];
   /* 0x0080 */ float tint_pad_20;
   /* 0x0084 */ int8_t tint_pad_11[124];
-  /* 0x0100 */ packed_float2 tint_pad_33;
+  /* 0x0100 */ float2 tint_pad_33;
   /* 0x0108 */ uint tint_pad_1;
   /* 0x010c */ int8_t tint_pad_12[4];
   /* 0x0110 */ packed_float3 tint_pad_3;
   /* 0x011c */ uint tint_pad_7;
-  /* 0x0120 */ packed_float4 tint_pad_25;
+  /* 0x0120 */ float4 tint_pad_25;
   /* 0x0130 */ uint tint_pad_5;
   /* 0x0134 */ int8_t tint_pad_13[4];
   /* 0x0138 */ float2x2 tint_pad_27;
diff --git a/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl b/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
index f33e9a7d56..eed156e0a6 100644
--- a/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
+++ b/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
@@ -11,8 +11,8 @@ struct Inner {
   /* 0x001c */ uint d;
   /* 0x0020 */ packed_float3 e;
   /* 0x002c */ float f;
-  /* 0x0030 */ packed_int2 g;
-  /* 0x0038 */ packed_int2 h;
+  /* 0x0030 */ int2 g;
+  /* 0x0038 */ int2 h;
   /* 0x0040 */ float2x3 i;
   /* 0x0060 */ float3x2 j;
   /* 0x0078 */ int8_t tint_pad[8];
diff --git a/test/buffer/uniform/static_index/read.wgsl.expected.msl b/test/buffer/uniform/static_index/read.wgsl.expected.msl
index bc3ce89915..1cc175ac54 100644
--- a/test/buffer/uniform/static_index/read.wgsl.expected.msl
+++ b/test/buffer/uniform/static_index/read.wgsl.expected.msl
@@ -18,8 +18,8 @@ struct S {
   /* 0x001c */ uint d;
   /* 0x0020 */ packed_float3 e;
   /* 0x002c */ float f;
-  /* 0x0030 */ packed_int2 g;
-  /* 0x0038 */ packed_int2 h;
+  /* 0x0030 */ int2 g;
+  /* 0x0038 */ int2 h;
   /* 0x0040 */ float2x3 i;
   /* 0x0060 */ float3x2 j;
   /* 0x0078 */ int8_t tint_pad_1[8];
diff --git a/test/bug/dawn/947.wgsl.expected.msl b/test/bug/dawn/947.wgsl.expected.msl
index 4bd7fd482b..11bf5634ff 100644
--- a/test/bug/dawn/947.wgsl.expected.msl
+++ b/test/bug/dawn/947.wgsl.expected.msl
@@ -2,8 +2,8 @@
 
 using namespace metal;
 struct Uniforms {
-  /* 0x0000 */ packed_float2 u_scale;
-  /* 0x0008 */ packed_float2 u_offset;
+  /* 0x0000 */ float2 u_scale;
+  /* 0x0008 */ float2 u_offset;
 };
 struct VertexOutputs {
   float2 texcoords;
diff --git a/test/bug/tint/1046.wgsl.expected.msl b/test/bug/tint/1046.wgsl.expected.msl
index 6081ab0e69..5f5c8464b0 100644
--- a/test/bug/tint/1046.wgsl.expected.msl
+++ b/test/bug/tint/1046.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct PointLight {
-  /* 0x0000 */ packed_float4 position;
+  /* 0x0000 */ float4 position;
 };
 struct PointLights {
   /* 0x0000 */ PointLight values[1];
@@ -13,7 +13,7 @@ struct Uniforms {
   /* 0x0080 */ uint numPointLights;
   /* 0x0084 */ uint color_source;
   /* 0x0088 */ int8_t tint_pad[8];
-  /* 0x0090 */ packed_float4 color;
+  /* 0x0090 */ float4 color;
 };
 struct FragmentInput {
   float4 position;
diff --git a/test/bug/tint/744.wgsl.expected.msl b/test/bug/tint/744.wgsl.expected.msl
index 4c313e6dd9..1bdfd213fd 100644
--- a/test/bug/tint/744.wgsl.expected.msl
+++ b/test/bug/tint/744.wgsl.expected.msl
@@ -2,9 +2,9 @@
 
 using namespace metal;
 struct Uniforms {
-  /* 0x0000 */ packed_uint2 aShape;
-  /* 0x0008 */ packed_uint2 bShape;
-  /* 0x0010 */ packed_uint2 outShape;
+  /* 0x0000 */ uint2 aShape;
+  /* 0x0008 */ uint2 bShape;
+  /* 0x0010 */ uint2 outShape;
 };
 struct Matrix {
   /* 0x0000 */ uint numbers[1];
diff --git a/test/bug/tint/749.spvasm.expected.msl b/test/bug/tint/749.spvasm.expected.msl
index 46339a7d02..dd020c962a 100644
--- a/test/bug/tint/749.spvasm.expected.msl
+++ b/test/bug/tint/749.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/bug/tint/870.spvasm.expected.msl b/test/bug/tint/870.spvasm.expected.msl
index 4ad7d1cf43..cb5ce5fef0 100644
--- a/test/bug/tint/870.spvasm.expected.msl
+++ b/test/bug/tint/870.spvasm.expected.msl
@@ -5,8 +5,8 @@ struct tint_array_wrapper {
   /* 0x0000 */ int arr[6];
 };
 struct sspp962805860buildInformationS {
-  /* 0x0000 */ packed_float4 footprint;
-  /* 0x0010 */ packed_float4 offset;
+  /* 0x0000 */ float4 footprint;
+  /* 0x0010 */ float4 offset;
   /* 0x0020 */ int essence;
   /* 0x0024 */ tint_array_wrapper orientation;
 };
diff --git a/test/bug/tint/913.wgsl.expected.msl b/test/bug/tint/913.wgsl.expected.msl
index 88ae3d1091..a57752473b 100644
--- a/test/bug/tint/913.wgsl.expected.msl
+++ b/test/bug/tint/913.wgsl.expected.msl
@@ -4,9 +4,9 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint dstTextureFlipY;
   /* 0x0004 */ uint channelCount;
-  /* 0x0008 */ packed_uint2 srcCopyOrigin;
-  /* 0x0010 */ packed_uint2 dstCopyOrigin;
-  /* 0x0018 */ packed_uint2 copySize;
+  /* 0x0008 */ uint2 srcCopyOrigin;
+  /* 0x0010 */ uint2 dstCopyOrigin;
+  /* 0x0018 */ uint2 copySize;
 };
 struct OutputBuf {
   /* 0x0000 */ uint result[1];
diff --git a/test/bug/tint/922.wgsl.expected.msl b/test/bug/tint/922.wgsl.expected.msl
index a5f87bb84e..58763e88bb 100644
--- a/test/bug/tint/922.wgsl.expected.msl
+++ b/test/bug/tint/922.wgsl.expected.msl
@@ -2,19 +2,19 @@
 
 using namespace metal;
 struct Mat4x4_ {
-  /* 0x0000 */ packed_float4 mx;
-  /* 0x0010 */ packed_float4 my;
-  /* 0x0020 */ packed_float4 mz;
-  /* 0x0030 */ packed_float4 mw;
+  /* 0x0000 */ float4 mx;
+  /* 0x0010 */ float4 my;
+  /* 0x0020 */ float4 mz;
+  /* 0x0030 */ float4 mw;
 };
 struct Mat4x3_ {
-  /* 0x0000 */ packed_float4 mx;
-  /* 0x0010 */ packed_float4 my;
-  /* 0x0020 */ packed_float4 mz;
+  /* 0x0000 */ float4 mx;
+  /* 0x0010 */ float4 my;
+  /* 0x0020 */ float4 mz;
 };
 struct Mat4x2_ {
-  /* 0x0000 */ packed_float4 mx;
-  /* 0x0010 */ packed_float4 my;
+  /* 0x0000 */ float4 mx;
+  /* 0x0010 */ float4 my;
 };
 struct ub_SceneParams {
   /* 0x0000 */ Mat4x4_ u_Projection;
@@ -24,7 +24,7 @@ struct tint_array_wrapper {
 };
 struct ub_MaterialParams {
   /* 0x0000 */ tint_array_wrapper u_TexMtx;
-  /* 0x0020 */ packed_float4 u_Misc0_;
+  /* 0x0020 */ float4 u_Misc0_;
 };
 struct tint_array_wrapper_1 {
   /* 0x0000 */ Mat4x3_ arr[32];
diff --git a/test/bug/tint/943.spvasm.expected.msl b/test/bug/tint/943.spvasm.expected.msl
index fc91858da1..a8806ca8ac 100644
--- a/test/bug/tint/943.spvasm.expected.msl
+++ b/test/bug/tint/943.spvasm.expected.msl
@@ -10,7 +10,7 @@ struct Uniforms {
   /* 0x002c */ int8_t tint_pad_2[4];
   /* 0x0030 */ packed_int3 outShape;
   /* 0x003c */ int8_t tint_pad_3[4];
-  /* 0x0040 */ packed_int2 outShapeStrides;
+  /* 0x0040 */ int2 outShapeStrides;
 };
 struct ssbOut {
   /* 0x0000 */ float result[1];
diff --git a/test/bug/tint/948.wgsl.expected.msl b/test/bug/tint/948.wgsl.expected.msl
index b04507a449..eefb6f401e 100644
--- a/test/bug/tint/948.wgsl.expected.msl
+++ b/test/bug/tint/948.wgsl.expected.msl
@@ -6,9 +6,9 @@ struct LeftOver {
   /* 0x0004 */ uint padding;
   /* 0x0008 */ int8_t tint_pad[8];
   /* 0x0010 */ float4x4 worldViewProjection;
-  /* 0x0050 */ packed_float2 outputSize;
-  /* 0x0058 */ packed_float2 stageSize;
-  /* 0x0060 */ packed_float2 spriteMapSize;
+  /* 0x0050 */ float2 outputSize;
+  /* 0x0058 */ float2 stageSize;
+  /* 0x0060 */ float2 spriteMapSize;
   /* 0x0068 */ float stageScale;
   /* 0x006c */ float spriteCount;
   /* 0x0070 */ packed_float3 colorMul;
diff --git a/test/bug/tint/949.wgsl.expected.msl b/test/bug/tint/949.wgsl.expected.msl
index 1b38e14a91..63e609783e 100644
--- a/test/bug/tint/949.wgsl.expected.msl
+++ b/test/bug/tint/949.wgsl.expected.msl
@@ -15,16 +15,16 @@ struct LeftOver {
   /* 0x009c */ float u_parallaxScale;
   /* 0x00a0 */ float textureInfoName;
   /* 0x00a4 */ uint padding_1;
-  /* 0x00a8 */ packed_float2 tangentSpaceParameter0;
+  /* 0x00a8 */ float2 tangentSpaceParameter0;
 };
 struct Light0 {
-  /* 0x0000 */ packed_float4 vLightData;
-  /* 0x0010 */ packed_float4 vLightDiffuse;
-  /* 0x0020 */ packed_float4 vLightSpecular;
+  /* 0x0000 */ float4 vLightData;
+  /* 0x0010 */ float4 vLightDiffuse;
+  /* 0x0020 */ float4 vLightSpecular;
   /* 0x0030 */ packed_float3 vLightGround;
   /* 0x003c */ uint padding_2;
-  /* 0x0040 */ packed_float4 shadowsInfo;
-  /* 0x0050 */ packed_float2 depthValues;
+  /* 0x0040 */ float4 shadowsInfo;
+  /* 0x0050 */ float2 depthValues;
   /* 0x0058 */ int8_t tint_pad_1[8];
 };
 struct main_out {
diff --git a/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl b/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
index 9bb899fd34..bd77f40418 100644
--- a/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
+++ b/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct tint_padded_array_element {
-  /* 0x0000 */ packed_float2 el;
+  /* 0x0000 */ float2 el;
   /* 0x0008 */ int8_t tint_pad[8];
 };
 struct tint_array_wrapper {
diff --git a/test/samples/compute_boids.wgsl.expected.msl b/test/samples/compute_boids.wgsl.expected.msl
index 005dfaa103..9c1b8a824e 100644
--- a/test/samples/compute_boids.wgsl.expected.msl
+++ b/test/samples/compute_boids.wgsl.expected.msl
@@ -13,8 +13,8 @@ struct tint_symbol_3 {
   float4 value [[color(0)]];
 };
 struct Particle {
-  /* 0x0000 */ packed_float2 pos;
-  /* 0x0008 */ packed_float2 vel;
+  /* 0x0000 */ float2 pos;
+  /* 0x0008 */ float2 vel;
 };
 struct SimParams {
   /* 0x0000 */ float deltaT;
diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
index b4d0a25bba..e67374eb74 100644
--- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
+++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
@@ -5,7 +5,7 @@ struct S {
   /* 0x0000 */ float f;
   /* 0x0004 */ uint u;
   /* 0x0008 */ int8_t tint_pad[120];
-  /* 0x0080 */ packed_float4 v;
+  /* 0x0080 */ float4 v;
   /* 0x0090 */ int8_t tint_pad_1[112];
 };
 struct tint_symbol_1 {
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.spvasm.expected.msl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.spvasm.expected.msl
index 37464bf39b..306dcaa527 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct block0 {
-  /* 0x0000 */ packed_float4 data;
+  /* 0x0000 */ float4 data;
 };
 
 void main_1(device block0& x_4) {
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl.expected.msl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl.expected.msl
index 37464bf39b..306dcaa527 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct block0 {
-  /* 0x0000 */ packed_float4 data;
+  /* 0x0000 */ float4 data;
 };
 
 void main_1(device block0& x_4) {
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.spvasm.expected.msl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.spvasm.expected.msl
index fdcbca1137..8b15107f57 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct block0 {
-  /* 0x0000 */ packed_float4 in_color;
+  /* 0x0000 */ float4 in_color;
 };
 struct main_out {
   float4 gl_Position;
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl.expected.msl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl.expected.msl
index fdcbca1137..8b15107f57 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct block0 {
-  /* 0x0000 */ packed_float4 in_color;
+  /* 0x0000 */ float4 in_color;
 };
 struct main_out {
   float4 gl_Position;
diff --git a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.spvasm.expected.msl
index c7b4af485e..51b5870cac 100644
--- a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct tmp_struct {
   tint_array_wrapper nmb;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl.expected.msl
index c7b4af485e..51b5870cac 100644
--- a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct tmp_struct {
   tint_array_wrapper nmb;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.spvasm.expected.msl
index fddba838de..4afc65868d 100644
--- a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl.expected.msl
index fddba838de..4afc65868d 100644
--- a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.spvasm.expected.msl
index 5aecf21e19..e8231d9ea4 100644
--- a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float2 arr[17];
diff --git a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl.expected.msl
index 5aecf21e19..e8231d9ea4 100644
--- a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float2 arr[17];
diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.msl
index 4a67f4b7ab..d7ed948494 100644
--- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.msl
@@ -6,7 +6,7 @@ struct doesNotMatter {
   /* 0x0004 */ int data[1];
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 
 void main_1(constant buf1& x_10, device doesNotMatter& x_7, thread uint3* const tint_symbol_1) {
diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.msl
index 4a67f4b7ab..d7ed948494 100644
--- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.msl
@@ -6,7 +6,7 @@ struct doesNotMatter {
   /* 0x0004 */ int data[1];
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 
 void main_1(constant buf1& x_10, device doesNotMatter& x_7, thread uint3* const tint_symbol_1) {
diff --git a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.spvasm.expected.msl
index b3a2b1dd96..7d2bc53199 100644
--- a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl.expected.msl
index b3a2b1dd96..7d2bc53199 100644
--- a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.spvasm.expected.msl
index 1582403838..7c2698ec67 100644
--- a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl.expected.msl
index 1582403838..7c2698ec67 100644
--- a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.spvasm.expected.msl
index 492bcf0902..5e2a1ccc51 100644
--- a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl.expected.msl
index 492bcf0902..5e2a1ccc51 100644
--- a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.spvasm.expected.msl
index 76eb9ec809..27080023bd 100644
--- a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl.expected.msl
index 76eb9ec809..27080023bd 100644
--- a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.msl
index d5becd4693..dd12d4f996 100644
--- a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl.expected.msl
index 8fcd116a3b..53472e89c3 100644
--- a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.spvasm.expected.msl
index cc5c5f3931..6f4e504d09 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl.expected.msl
index cc5c5f3931..6f4e504d09 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.spvasm.expected.msl
index b5d23b3f1f..d72415c2ff 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.spvasm.expected.msl
@@ -12,7 +12,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_int_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ float el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl.expected.msl
index b5d23b3f1f..d72415c2ff 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl.expected.msl
@@ -12,7 +12,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_int_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ float el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm.expected.msl
index a3656f268d..fe80104f71 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl.expected.msl
index a3656f268d..fe80104f71 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.spvasm.expected.msl
index 4d278f3d4a..13d3cb9308 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 one;
+  /* 0x0000 */ float2 one;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl.expected.msl
index 4d278f3d4a..13d3cb9308 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 one;
+  /* 0x0000 */ float2 one;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.spvasm.expected.msl
index 5ed2327010..9cab884cd7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[3];
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl.expected.msl
index 5ed2327010..9cab884cd7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[3];
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.msl
index 7082501cb5..a409595db8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.msl
@@ -22,7 +22,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_int_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.msl
index 7082501cb5..a409595db8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.msl
@@ -22,7 +22,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_int_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.spvasm.expected.msl
index 8361a17b03..88f980ba61 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 twoandthree;
+  /* 0x0000 */ float2 twoandthree;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl.expected.msl
index 8361a17b03..88f980ba61 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 twoandthree;
+  /* 0x0000 */ float2 twoandthree;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.spvasm.expected.msl
index 2f956326ae..9d0c9f6db5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl.expected.msl
index 2f956326ae..9d0c9f6db5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.msl
index 7aa0bda199..574c1ceb9c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.msl
index 7aa0bda199..574c1ceb9c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.msl
index 19f18181fa..4f65e53232 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 threeandfour;
+  /* 0x0000 */ float2 threeandfour;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.msl
index 19f18181fa..4f65e53232 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 threeandfour;
+  /* 0x0000 */ float2 threeandfour;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.spvasm.expected.msl
index c35cbbf3b2..6535247e5e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 zeroOne;
+  /* 0x0000 */ float2 zeroOne;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl.expected.msl
index c35cbbf3b2..6535247e5e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 zeroOne;
+  /* 0x0000 */ float2 zeroOne;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.spvasm.expected.msl
index 38011e638c..a2e6bbe5fe 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.spvasm.expected.msl
@@ -5,7 +5,7 @@ struct S {
   int data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl.expected.msl
index 38011e638c..a2e6bbe5fe 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl.expected.msl
@@ -5,7 +5,7 @@ struct S {
   int data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.spvasm.expected.msl
index 431dffd995..a821844554 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl.expected.msl
index 431dffd995..a821844554 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.spvasm.expected.msl
index 4d3ae08a0d..86dcd7f80c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.spvasm.expected.msl
@@ -22,7 +22,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl.expected.msl
index 4d3ae08a0d..86dcd7f80c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl.expected.msl
@@ -22,7 +22,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.spvasm.expected.msl
index 606d33f8a6..f9b353c930 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl.expected.msl
index 606d33f8a6..f9b353c930 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.spvasm.expected.msl
index 35fcbc7b53..e03ded26ea 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_int4 sequence;
+  /* 0x0000 */ int4 sequence;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl.expected.msl
index 35fcbc7b53..e03ded26ea 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_int4 sequence;
+  /* 0x0000 */ int4 sequence;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.spvasm.expected.msl
index 46ab0ae5e4..4685042942 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl.expected.msl
index 46ab0ae5e4..4685042942 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.spvasm.expected.msl
index 0a5469afc0..dc70a335a1 100755
--- a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.spvasm.expected.msl
@@ -18,10 +18,10 @@ struct buf1 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 zeroVec;
+  /* 0x0000 */ float2 zeroVec;
 };
 struct buf3 {
-  /* 0x0000 */ packed_float2 oneVec;
+  /* 0x0000 */ float2 oneVec;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl.expected.msl
index 0a5469afc0..dc70a335a1 100755
--- a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl.expected.msl
@@ -18,10 +18,10 @@ struct buf1 {
   /* 0x0000 */ tint_array_wrapper_1 x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 zeroVec;
+  /* 0x0000 */ float2 zeroVec;
 };
 struct buf3 {
-  /* 0x0000 */ packed_float2 oneVec;
+  /* 0x0000 */ float2 oneVec;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.spvasm.expected.msl
index 7654af7845..84beec09df 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.spvasm.expected.msl
@@ -12,7 +12,7 @@ struct buf1 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl.expected.msl
index 7654af7845..84beec09df 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl.expected.msl
@@ -12,7 +12,7 @@ struct buf1 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_float_values;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_padded_array_element_1 {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.spvasm.expected.msl
index d75527820f..2a95bc7cf6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.spvasm.expected.msl
@@ -5,7 +5,7 @@ struct S {
   int data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl.expected.msl
index d75527820f..2a95bc7cf6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl.expected.msl
@@ -5,7 +5,7 @@ struct S {
   int data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct tint_padded_array_element {
   /* 0x0000 */ int el;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.spvasm.expected.msl
index b75ca5d83d..6fed219ba0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.spvasm.expected.msl
@@ -12,7 +12,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_float_values;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl.expected.msl
index 0f4d9f74bb..c0b43468dc 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl.expected.msl
@@ -12,7 +12,7 @@ struct buf0 {
   /* 0x0000 */ tint_array_wrapper x_GLF_uniform_float_values;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 v1;
+  /* 0x0000 */ float2 v1;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.spvasm.expected.msl
index 4e1e472f5d..e2124526fd 100644
--- a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl.expected.msl
index 4e1e472f5d..e2124526fd 100644
--- a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.spvasm.expected.msl
index 187df326a7..5447590487 100644
--- a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.spvasm.expected.msl
@@ -5,7 +5,7 @@ struct theSSBO {
   /* 0x0000 */ int out_data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 
 void main_1(constant buf1& x_6, device theSSBO& x_4) {
diff --git a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl.expected.msl
index 187df326a7..5447590487 100644
--- a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl.expected.msl
@@ -5,7 +5,7 @@ struct theSSBO {
   /* 0x0000 */ int out_data;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 
 void main_1(constant buf1& x_6, device theSSBO& x_4) {
diff --git a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.spvasm.expected.msl
index 3978f97a75..7d8653c0f1 100644
--- a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl.expected.msl
index 3978f97a75..7d8653c0f1 100644
--- a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.spvasm.expected.msl
index 7196372c31..e70aeb8cb5 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl.expected.msl
index 7196372c31..e70aeb8cb5 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.spvasm.expected.msl
index 5e753cf7cf..3f3017a6f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl.expected.msl
index 5e753cf7cf..3f3017a6f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.spvasm.expected.msl
index 85e982d290..7ddba58a4b 100644
--- a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl.expected.msl
index 85e982d290..7ddba58a4b 100644
--- a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.spvasm.expected.msl
index 49c3e8cef1..bc0b5ce8f7 100644
--- a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl.expected.msl
index 49c3e8cef1..bc0b5ce8f7 100644
--- a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.spvasm.expected.msl
index e370e6e070..f5a905ec77 100644
--- a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl.expected.msl
index e370e6e070..f5a905ec77 100644
--- a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.spvasm.expected.msl
index 5fc5f85c51..9661c7742c 100644
--- a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl.expected.msl
index 5fc5f85c51..9661c7742c 100644
--- a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.spvasm.expected.msl
index b11e929ce6..b28d411b4d 100644
--- a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[2];
diff --git a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl.expected.msl
index b11e929ce6..b28d411b4d 100644
--- a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[2];
diff --git a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.spvasm.expected.msl
index 6e8c035852..94b57d9712 100644
--- a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl.expected.msl
index 6e8c035852..94b57d9712 100644
--- a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.spvasm.expected.msl
index 13701d9648..4ee64c5700 100644
--- a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl.expected.msl
index 13701d9648..4ee64c5700 100644
--- a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.msl
index 03ffdab520..34bc5ce4f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl.expected.msl
index 34b68d4790..deec1dae57 100644
--- a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.spvasm.expected.msl
index 76d1e33b31..af02cf46da 100644
--- a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct BinarySearchObject {
   tint_array_wrapper prime_numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl.expected.msl
index 76d1e33b31..af02cf46da 100644
--- a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct BinarySearchObject {
   tint_array_wrapper prime_numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.spvasm.expected.msl
index 7edfb52835..ad8b9c29c4 100644
--- a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl.expected.msl
index 7edfb52835..ad8b9c29c4 100644
--- a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.spvasm.expected.msl
index 8a6f6de110..5672d2dd77 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl.expected.msl
index 8a6f6de110..5672d2dd77 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.msl
index 3b5c8210e8..bd797f1f69 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl.expected.msl
index bd4986a4d1..5eec8a91f7 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.spvasm.expected.msl
index 11785658b1..0fd49c23ad 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl.expected.msl
index 11785658b1..0fd49c23ad 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.spvasm.expected.msl
index 04a9ce21aa..b0a84b551f 100644
--- a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl.expected.msl
index 04a9ce21aa..b0a84b551f 100644
--- a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.spvasm.expected.msl
index c439da6a26..5b54e661e1 100644
--- a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl.expected.msl
index c439da6a26..5b54e661e1 100644
--- a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.spvasm.expected.msl
index bb35e66841..54a7b6bcfa 100644
--- a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl.expected.msl
index bb35e66841..54a7b6bcfa 100644
--- a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.spvasm.expected.msl
index a56ad4ca48..882e276e59 100644
--- a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl.expected.msl
index a56ad4ca48..882e276e59 100644
--- a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.spvasm.expected.msl
index 98a5d7f385..7487fa5c6a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl.expected.msl
index 98a5d7f385..7487fa5c6a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.spvasm.expected.msl
index c60e9073f0..4f5d16ec4b 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl.expected.msl
index a1989fca9c..27475396a7 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.spvasm.expected.msl
index 4b52877563..082734589d 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl.expected.msl
index f77b86b9e0..9e79e004cf 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.spvasm.expected.msl
index 203fef6865..4bd1e3f041 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl.expected.msl
index 203fef6865..4bd1e3f041 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.spvasm.expected.msl
index ce529ef8a4..e021be18da 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl.expected.msl
index ce529ef8a4..e021be18da 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.spvasm.expected.msl
index d343b1c58d..c4b46a5357 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl.expected.msl
index d343b1c58d..c4b46a5357 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.spvasm.expected.msl
index fb55e831bd..d016030464 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl.expected.msl
index fb55e831bd..d016030464 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.spvasm.expected.msl
index a43e94d0b9..cb41180fd5 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl.expected.msl
index a43e94d0b9..cb41180fd5 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.spvasm.expected.msl
index 1624fe2140..5e37f387f8 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl.expected.msl
index 1624fe2140..5e37f387f8 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.spvasm.expected.msl
index da51ebcc23..8c0c869477 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl.expected.msl
index da51ebcc23..8c0c869477 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.msl
index 554121d769..f76fa2ad0a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl.expected.msl
index e9497fe98d..26b730003a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.msl
index c904072e69..ff612641a9 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl.expected.msl
index be25e9114f..4dbb836d82 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.spvasm.expected.msl
index 97e447b44c..d7bf86c67b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl.expected.msl
index 97e447b44c..d7bf86c67b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.spvasm.expected.msl
index a5e1be210e..e7d323ce8a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl.expected.msl
index a5e1be210e..e7d323ce8a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.msl
index c5e09f755e..76b8e467f1 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl.expected.msl
index 6e261fd596..d8d2288f79 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.spvasm.expected.msl
index 6e79a07e35..87a56058ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl.expected.msl
index 6e79a07e35..87a56058ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.spvasm.expected.msl
index 44b01873b1..aaee00b27e 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl.expected.msl
index 44b01873b1..aaee00b27e 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.spvasm.expected.msl
index a31a704dd6..b9b9c97158 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl.expected.msl
index a31a704dd6..b9b9c97158 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.spvasm.expected.msl
index 7440769378..7209fafb00 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl.expected.msl
index 7440769378..7209fafb00 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.spvasm.expected.msl
index dd5350a3b4..9839113e97 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl.expected.msl
index dd5350a3b4..9839113e97 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.spvasm.expected.msl
index a2c1a5fda0..30ff268776 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl.expected.msl
index a2c1a5fda0..30ff268776 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.spvasm.expected.msl
index 59a59044b5..1ff5bff1ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl.expected.msl
index 59a59044b5..1ff5bff1ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.spvasm.expected.msl
index 685b2ff717..7e2be6e439 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl.expected.msl
index 661207d6ab..b2d2ae38e4 100755
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.msl
index e567765f47..902b3c99dc 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.msl
index e567765f47..902b3c99dc 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.spvasm.expected.msl
index bf26bed8a1..55767c6a1b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl.expected.msl
index bf26bed8a1..55767c6a1b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.msl
index 56dceaa2bd..f9d3c1589f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl.expected.msl
index 98ee292ed7..81ad77b6a6 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.msl
index 4b8d917973..19683b6c02 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl.expected.msl
index 2071bd11c8..4f7238af06 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.msl
index eead08d915..ac488933e7 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl.expected.msl
index 5970567cbb..1002492558 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.msl
index 9077451723..95be48667b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl.expected.msl
index 233095704e..cd9fda1af2 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.msl
index 2fa6daad31..4d5dc70df1 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl.expected.msl
index c9324dd1f6..add82764ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.msl
index a7866a2ecf..2f6e111461 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl.expected.msl
index 82af62cf9d..9cf1ee4827 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.msl
index 98f46a0f4d..7834adca88 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl.expected.msl
index 49f299eadb..1c776f0abf 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.msl
index 765912de2a..72be55c71d 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl.expected.msl
index 0a20d9302b..c52ca683e3 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.spvasm.expected.msl
index 79268ae127..c7cd04d498 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl.expected.msl
index 79268ae127..c7cd04d498 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.spvasm.expected.msl
index 2740551a64..33cf6cc56f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl.expected.msl
index 2740551a64..33cf6cc56f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.spvasm.expected.msl
index f592466fdd..50cfb2cb23 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl.expected.msl
index f592466fdd..50cfb2cb23 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.spvasm.expected.msl
index 91a89515bc..441c5369cc 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl.expected.msl
index 91a89515bc..441c5369cc 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.spvasm.expected.msl
index ee53aba53b..d53364e3d1 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.spvasm.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl.expected.msl
index ee53aba53b..d53364e3d1 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl.expected.msl
@@ -7,7 +7,7 @@ int tint_unary_minus(const int v) {
 }
 
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.spvasm.expected.msl
index 042ed0c658..51771e2466 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl.expected.msl
index 042ed0c658..51771e2466 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.spvasm.expected.msl
index 122125fb53..37734f4cc4 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl.expected.msl
index 122125fb53..37734f4cc4 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.spvasm.expected.msl
index db783985ed..0384463c38 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl.expected.msl
index db783985ed..0384463c38 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.spvasm.expected.msl
index 6ac12f1589..f6b6b10968 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl.expected.msl
index 6ac12f1589..f6b6b10968 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   int arr[256];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.spvasm.expected.msl
index 937c75885d..91fb695f7f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl.expected.msl
index 937c75885d..91fb695f7f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.spvasm.expected.msl
index ccdc0007b5..a628729e8d 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl.expected.msl
index ccdc0007b5..a628729e8d 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.spvasm.expected.msl
index 0b6546d189..2ab88630ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl.expected.msl
index 0b6546d189..2ab88630ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.spvasm.expected.msl
index 4eb5fa11a0..c762439980 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl.expected.msl
index 4eb5fa11a0..c762439980 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.spvasm.expected.msl
index 9437ce732d..95ce08aa63 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl.expected.msl
index 9437ce732d..95ce08aa63 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.spvasm.expected.msl
index 76e4639b84..0054917551 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.spvasm.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl.expected.msl
index 76e4639b84..0054917551 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.spvasm.expected.msl
index 5dcf502ad0..786e864d04 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.spvasm.expected.msl
@@ -13,7 +13,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper_1 {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl.expected.msl
index 5dcf502ad0..786e864d04 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl.expected.msl
@@ -13,7 +13,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper_1 {
   BST arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.spvasm.expected.msl
index a149e5baa4..2555b63109 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl.expected.msl
index a149e5baa4..2555b63109 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[16];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.spvasm.expected.msl
index 41ee53557b..1465f73e3b 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl.expected.msl
index 60d6aa5ee6..83118e740b 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.spvasm.expected.msl
index 1420486240..8641e118cb 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.msl
index 3122dc667f..9ce5a97b55 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.spvasm.expected.msl
index 30a0b7c9b0..a11f78aa2b 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.msl
index 6e921c8f9a..5416651e27 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.spvasm.expected.msl
index a91185bdfb..758aceb730 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl.expected.msl
index 5aebe2c229..702ff6202e 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.spvasm.expected.msl
index b8d279e7ad..082ddb12f7 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl.expected.msl
index c30dcfddfa..b8ab26ff2b 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.spvasm.expected.msl
index 6c63c38f0c..63c79265db 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.msl
index 52d5ba9630..4d25edabdb 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.spvasm.expected.msl
index 23d3b1c909..b1830a5a79 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.msl
index fc0eff4fce..eef1996158 100755
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.msl
index 8a8ae50b56..d0cde330d6 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl.expected.msl
index 557f911a36..ca9c1aa2fa 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.msl
index 32f9395d85..74e6b33ba6 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl.expected.msl
index 03ab2986d5..b28eeb1010 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.msl
index 8a3779594d..c59a7c7f1c 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl.expected.msl
index c325cfff18..80349e38a2 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.spvasm.expected.msl
index 02e660f515..04887e89ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl.expected.msl
index 02e660f515..04887e89ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.spvasm.expected.msl
index 3eeabc0109..31785aa645 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl.expected.msl
index 3eeabc0109..31785aa645 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.spvasm.expected.msl
index 3fa889c459..f8ffe936ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.spvasm.expected.msl
@@ -8,10 +8,10 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl.expected.msl
index 3fa889c459..f8ffe936ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl.expected.msl
@@ -8,10 +8,10 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.spvasm.expected.msl
index c013d1ca76..c68e4906aa 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl.expected.msl
index c013d1ca76..c68e4906aa 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.spvasm.expected.msl
index cd63817508..c2fe24a70a 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.spvasm.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl.expected.msl
index cd63817508..c2fe24a70a 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl.expected.msl
@@ -8,7 +8,7 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.spvasm.expected.msl
index e69127f35c..a05603d306 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.spvasm.expected.msl
@@ -8,10 +8,10 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl.expected.msl
index e69127f35c..a05603d306 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl.expected.msl
@@ -8,10 +8,10 @@ struct QuicksortObject {
   tint_array_wrapper numbers;
 };
 struct buf1 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 frag_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.spvasm.expected.msl
index b78cdb2dcf..601d433840 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl.expected.msl
index b78cdb2dcf..601d433840 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct tint_array_wrapper {
   float4 arr[8];
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.msl
index e876cbc203..130bc87dcd 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.msl
index 7cbe87b224..83bdf89606 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.msl
index 10810070c2..c0e4eaea58 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.msl
index e07a9ab6c7..45559fcd61 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.msl
index c038002374..2889e23109 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.msl
index e847253bc2..be2b17f96f 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.msl
index 8cecda9f0b..4c0073cff3 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl.expected.msl
index 1c1d52740f..78630b3123 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.msl
index c9cce2f0f5..182686bdd5 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.msl
index d048adaa02..f2f0ffb87b 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.msl
index cb0746badc..60e7bc905f 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.msl
index 0026d068dd..f92452fec1 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.spvasm.expected.msl
index 72d12712cc..3d508551b8 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.spvasm.expected.msl
@@ -7,7 +7,7 @@ struct struct_base {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   struct_base arr[3];
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl.expected.msl
index 72d12712cc..3d508551b8 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl.expected.msl
@@ -7,7 +7,7 @@ struct struct_base {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   struct_base arr[3];
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.spvasm.expected.msl
index afc2ac2574..0cef996bd9 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.spvasm.expected.msl
@@ -6,7 +6,7 @@ struct S {
   bool3 f1;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl.expected.msl
index afc2ac2574..0cef996bd9 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl.expected.msl
@@ -6,7 +6,7 @@ struct S {
   bool3 f1;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[9];
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.spvasm.expected.msl
index 4e2f0d0fab..3df56f54f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct S {
-  /* 0x0000 */ packed_float4 field0;
+  /* 0x0000 */ float4 field0;
 };
 struct S_1 {
   float4 field0;
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl.expected.msl
index 4e2f0d0fab..3df56f54f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct S {
-  /* 0x0000 */ packed_float4 field0;
+  /* 0x0000 */ float4 field0;
 };
 struct S_1 {
   float4 field0;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.spvasm.expected.msl
index c7ed117a72..f4fc1a14bf 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl.expected.msl
index c7ed117a72..f4fc1a14bf 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.spvasm.expected.msl
index 992eceb400..fb07b37565 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl.expected.msl
index 992eceb400..fb07b37565 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.spvasm.expected.msl
index 1be3886e00..54478d44e7 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl.expected.msl
index 1be3886e00..54478d44e7 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.spvasm.expected.msl
index b2a9e1d56e..3c63eb8931 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl.expected.msl
index b2a9e1d56e..3c63eb8931 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.msl
index af2585fd8d..e7804bf636 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct doesNotMatter {
   /* 0x0000 */ uint x_compute_data[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.msl
index af2585fd8d..e7804bf636 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct doesNotMatter {
   /* 0x0000 */ uint x_compute_data[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.spvasm.expected.msl
index 8357dafb79..1ee3b13325 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct StructType {
   float3 col;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl.expected.msl
index 8357dafb79..1ee3b13325 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct StructType {
   float3 col;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.spvasm.expected.msl
index c13a2f2961..87a02f1455 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl.expected.msl
index c13a2f2961..87a02f1455 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.spvasm.expected.msl
index 4acc343940..bcfbeef01e 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.wgsl.expected.msl
index 4acc343940..bcfbeef01e 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-infinite-loops-discard/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.spvasm.expected.msl
index 6fc3bb7686..17d233fcec 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl.expected.msl
index 6fc3bb7686..17d233fcec 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   int arr[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.spvasm.expected.msl
index 1d7bf38aa9..660a290d0e 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl.expected.msl
index 1d7bf38aa9..660a290d0e 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.spvasm.expected.msl
index 58a69c7c8a..79bd5b21b0 100644
--- a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl.expected.msl
index 58a69c7c8a..79bd5b21b0 100644
--- a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.msl
index 8e628fb1b6..cefc24066f 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct doesNotMatter {
   /* 0x0000 */ int x_compute_data[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.msl
index 8e628fb1b6..cefc24066f 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.msl
@@ -2,10 +2,10 @@
 
 using namespace metal;
 struct buf1 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct buf2 {
-  /* 0x0000 */ packed_float2 resolution;
+  /* 0x0000 */ float2 resolution;
 };
 struct doesNotMatter {
   /* 0x0000 */ int x_compute_data[1];
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.spvasm.expected.msl
index 83386e546c..0230992266 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl.expected.msl
index 83386e546c..0230992266 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.spvasm.expected.msl
index 4a64335ff4..85a481a3e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl.expected.msl
index 4a64335ff4..85a481a3e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.spvasm.expected.msl
index 53a077e636..c990590081 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injected;
+  /* 0x0000 */ float2 injected;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl.expected.msl
index 53a077e636..c990590081 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injected;
+  /* 0x0000 */ float2 injected;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.spvasm.expected.msl
index ce8bb27e90..35aaeb3877 100644
--- a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl.expected.msl
index ce8bb27e90..35aaeb3877 100644
--- a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.spvasm.expected.msl
index c300c39c97..5d47b5db2c 100644
--- a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl.expected.msl
index c300c39c97..5d47b5db2c 100644
--- a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.msl
index 2912538439..172584a846 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl.expected.msl
index 843cdb2ee6..e7520312bf 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl.expected.msl
@@ -7,7 +7,7 @@ struct BST {
   int rightIndex;
 };
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct tint_array_wrapper {
   float arr[10];
diff --git a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.spvasm.expected.msl b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.spvasm.expected.msl
index c44d2d755b..93812674df 100644
--- a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.spvasm.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.spvasm.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;
diff --git a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl.expected.msl b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl.expected.msl
index c44d2d755b..93812674df 100644
--- a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl.expected.msl
+++ b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl.expected.msl
@@ -2,7 +2,7 @@
 
 using namespace metal;
 struct buf0 {
-  /* 0x0000 */ packed_float2 injectionSwitch;
+  /* 0x0000 */ float2 injectionSwitch;
 };
 struct main_out {
   float4 x_GLF_color_1;