[spirv] Only add explicit layout decorations on types that need them

Find all of the array and structure types that require explicit layout
decorations before emitting any instructions, so that we can add the
layout decorations when the types are emitted.

This does not address the case where a type is used in multiple
address space, which will be handled by a new transform that forks
those types.

Bug: 42252012
Change-Id: I4ee37d36d97c729b73fef89782881e1557fbb0ce
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/228834
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/spirv/writer/function_test.cc b/src/tint/lang/spirv/writer/function_test.cc
index 6a700a6..1d4a78d 100644
--- a/src/tint/lang/spirv/writer/function_test.cc
+++ b/src/tint/lang/spirv/writer/function_test.cc
@@ -536,7 +536,7 @@
                OpDecorate %main_loc0_idx0_Output Index 0
                OpDecorate %main_loc0_idx1_Output Location 0
                OpDecorate %main_loc0_idx1_Output Index 1
-    )");
+)");
     EXPECT_INST(R"(
 %main_loc0_idx0_Output = OpVariable %_ptr_Output_float Output   ; Location 0, Index 0
 %main_loc0_idx1_Output = OpVariable %_ptr_Output_float Output   ; Location 0, Index 1
diff --git a/src/tint/lang/spirv/writer/printer/printer.cc b/src/tint/lang/spirv/writer/printer/printer.cc
index 66491b7..533e9bd 100644
--- a/src/tint/lang/spirv/writer/printer/printer.cc
+++ b/src/tint/lang/spirv/writer/printer/printer.cc
@@ -240,6 +240,9 @@
         }
     };
 
+    /// The set of types that require explicit layout decorations.
+    Hashset<const core::type::Type*, 16> requires_layout_decorations_;
+
     /// The map of types to their result IDs.
     Hashmap<const core::type::Type*, uint32_t, 8> types_;
 
@@ -305,6 +308,9 @@
                                                              U32Operand(SpvMemoryModelGLSL450)});
         }
 
+        // Find types that require explicit layout decorations.
+        FindTypesThatRequireLayoutDecorations();
+
         // Emit module-scope declarations.
         EmitRootBlock(ir_.root_block);
 
@@ -376,6 +382,39 @@
         return SpvBuiltInMax;
     }
 
+    /// Find all array and structure types that are used in host-shareable address spaces and mark
+    /// them as such so that we know to add explicit layout decorations when we emit them.
+    void FindTypesThatRequireLayoutDecorations() {
+        // We only look at module-scope variable declarations, since this is where all
+        // host-shareable types are declared.
+        for (auto* decl : *ir_.root_block) {
+            if (auto* var = decl->As<core::ir::Var>()) {
+                auto* ptr = var->Result(0)->Type()->As<core::type::Pointer>();
+                if (!core::IsHostShareable(ptr->AddressSpace())) {
+                    continue;
+                }
+
+                // Look for arrays and structures at any nesting depth of this type.
+                Vector<const core::type::Type*, 8> type_queue;
+                type_queue.Push(ptr->StoreType());
+                while (!type_queue.IsEmpty()) {
+                    auto* next = type_queue.Pop();
+                    if (auto* str = next->As<core::type::Struct>()) {
+                        // Record this structure as host-shareable and then check its members.
+                        requires_layout_decorations_.Add(str);
+                        for (auto* member : str->Members()) {
+                            type_queue.Push(member->Type());
+                        }
+                    } else if (auto* arr = next->As<core::type::Array>()) {
+                        // Record this array as host-shareable and then check its element type.
+                        requires_layout_decorations_.Add(arr);
+                        type_queue.Push(arr->ElemType());
+                    }
+                }
+            }
+        }
+    }
+
     /// Get the result ID of the constant `constant`, emitting its instruction if necessary.
     /// @param constant the constant to get the ID for
     /// @returns the result ID of the constant
@@ -526,8 +565,11 @@
                         TINT_ASSERT(arr->Count()->Is<core::type::RuntimeArrayCount>());
                         module_.PushType(spv::Op::OpTypeRuntimeArray, {id, Type(arr->ElemType())});
                     }
-                    module_.PushAnnot(spv::Op::OpDecorate,
-                                      {id, U32Operand(SpvDecorationArrayStride), arr->Stride()});
+                    if (requires_layout_decorations_.Contains(arr)) {
+                        module_.PushAnnot(
+                            spv::Op::OpDecorate,
+                            {id, U32Operand(SpvDecorationArrayStride), arr->Stride()});
+                    }
                 },
                 [&](const core::type::Pointer* ptr) {
                     module_.PushType(spv::Op::OpTypePointer,
@@ -617,19 +659,21 @@
         for (auto* member : str->Members()) {
             operands.push_back(Type(member->Type()));
 
-            // Generate struct member offset decoration.
-            module_.PushAnnot(
-                spv::Op::OpMemberDecorate,
-                {operands[0], member->Index(), U32Operand(SpvDecorationOffset), member->Offset()});
+            if (requires_layout_decorations_.Contains(str)) {
+                // Generate struct member offset decoration.
+                module_.PushAnnot(spv::Op::OpMemberDecorate,
+                                  {operands[0], member->Index(), U32Operand(SpvDecorationOffset),
+                                   member->Offset()});
 
-            // Emit matrix layout decorations if necessary.
-            if (auto* matrix_type = get_nested_matrix_type(member->Type())) {
-                const uint32_t effective_row_count = (matrix_type->Rows() == 2) ? 2 : 4;
-                module_.PushAnnot(spv::Op::OpMemberDecorate,
-                                  {id, member->Index(), U32Operand(SpvDecorationColMajor)});
-                module_.PushAnnot(spv::Op::OpMemberDecorate,
-                                  {id, member->Index(), U32Operand(SpvDecorationMatrixStride),
-                                   Operand(effective_row_count * matrix_type->Type()->Size())});
+                // Emit matrix layout decorations if necessary.
+                if (auto* matrix_type = get_nested_matrix_type(member->Type())) {
+                    const uint32_t effective_row_count = (matrix_type->Rows() == 2) ? 2 : 4;
+                    module_.PushAnnot(spv::Op::OpMemberDecorate,
+                                      {id, member->Index(), U32Operand(SpvDecorationColMajor)});
+                    module_.PushAnnot(spv::Op::OpMemberDecorate,
+                                      {id, member->Index(), U32Operand(SpvDecorationMatrixStride),
+                                       Operand(effective_row_count * matrix_type->Type()->Size())});
+                }
             }
 
             PushMemberName(id, member->Index(), member->Name());
diff --git a/src/tint/lang/spirv/writer/type_test.cc b/src/tint/lang/spirv/writer/type_test.cc
index f5970b5..d8affc3 100644
--- a/src/tint/lang/spirv/writer/type_test.cc
+++ b/src/tint/lang/spirv/writer/type_test.cc
@@ -164,9 +164,20 @@
     EXPECT_INST("%mat4v2half = OpTypeMatrix %v2half 4");
 }
 
+TEST_F(SpirvWriterTest, Type_Array_NoExplicitLayout) {
+    b.Append(b.ir.root_block, [&] {  //
+        b.Var<private_, array<f32, 4>>("v");
+    });
+
+    ASSERT_TRUE(Generate()) << Error() << output_;
+    EXPECT_INST("%_arr_float_uint_4 = OpTypeArray %float %uint_4");
+    EXPECT_THAT(output_, testing::Not(testing::HasSubstr("OpDecorate %_arr_float_uint_4")));
+}
+
 TEST_F(SpirvWriterTest, Type_Array_DefaultStride) {
     b.Append(b.ir.root_block, [&] {  //
-        b.Var<private_, array<f32, 4>, read_write>("v");
+        auto* v = b.Var<storage, array<f32, 4>>("v");
+        v->SetBindingPoint(0, 0);
     });
 
     ASSERT_TRUE(Generate()) << Error() << output_;
@@ -176,7 +187,8 @@
 
 TEST_F(SpirvWriterTest, Type_Array_ExplicitStride) {
     b.Append(b.ir.root_block, [&] {  //
-        b.Var("v", ty.ptr<private_, read_write>(ty.array<f32, 4>(16)));
+        auto* v = b.Var("v", ty.ptr<storage>(ty.array<f32, 4>(16)));
+        v->SetBindingPoint(0, 0);
     });
 
     ASSERT_TRUE(Generate()) << Error() << output_;
@@ -186,7 +198,8 @@
 
 TEST_F(SpirvWriterTest, Type_Array_NestedArray) {
     b.Append(b.ir.root_block, [&] {  //
-        b.Var<private_, array<array<f32, 64>, 4>, read_write>("v");
+        auto* v = b.Var<storage, array<array<f32, 64>, 4>>("v");
+        v->SetBindingPoint(0, 0);
     });
 
     ASSERT_TRUE(Generate()) << Error() << output_;
@@ -218,7 +231,7 @@
     EXPECT_INST("%_runtimearr_float = OpTypeRuntimeArray %float");
 }
 
-TEST_F(SpirvWriterTest, Type_Struct) {
+TEST_F(SpirvWriterTest, Type_Struct_NoExplicitLayout) {
     auto* str =
         ty.Struct(mod.symbols.New("MyStruct"), {
                                                    {mod.symbols.Register("a"), ty.f32()},
@@ -232,6 +245,25 @@
     EXPECT_INST("OpMemberName %MyStruct 0 \"a\"");
     EXPECT_INST("OpMemberName %MyStruct 1 \"b\"");
     EXPECT_INST("OpName %MyStruct \"MyStruct\"");
+    EXPECT_INST("%MyStruct = OpTypeStruct %float %v4int");
+    EXPECT_THAT(output_, testing::Not(testing::HasSubstr("OpMemberDecorate %MyStruct")));
+}
+
+TEST_F(SpirvWriterTest, Type_Struct) {
+    auto* str =
+        ty.Struct(mod.symbols.New("MyStruct"), {
+                                                   {mod.symbols.Register("a"), ty.f32()},
+                                                   {mod.symbols.Register("b"), ty.vec4<i32>()},
+                                               });
+    b.Append(b.ir.root_block, [&] {  //
+        auto* v = b.Var("v", ty.ptr<storage>(str));
+        v->SetBindingPoint(0, 0);
+    });
+
+    ASSERT_TRUE(Generate()) << Error() << output_;
+    EXPECT_INST("OpMemberName %MyStruct 0 \"a\"");
+    EXPECT_INST("OpMemberName %MyStruct 1 \"b\"");
+    EXPECT_INST("OpName %MyStruct \"MyStruct\"");
     EXPECT_INST("OpMemberDecorate %MyStruct 0 Offset 0");
     EXPECT_INST("OpMemberDecorate %MyStruct 1 Offset 16");
     EXPECT_INST("%MyStruct = OpTypeStruct %float %v4int");
@@ -246,7 +278,8 @@
             {mod.symbols.Register("arr"), ty.array(ty.array(ty.mat2x4<f16>(), 4), 4)},
         });
     b.Append(b.ir.root_block, [&] {  //
-        b.Var("v", ty.ptr<private_, read_write>(str));
+        auto* v = b.Var("v", ty.ptr<storage>(str));
+        v->SetBindingPoint(0, 0);
     });
 
     ASSERT_TRUE(Generate()) << Error() << output_;
diff --git a/src/tint/lang/spirv/writer/writer_test.cc b/src/tint/lang/spirv/writer/writer_test.cc
index da9718a..2c60b31 100644
--- a/src/tint/lang/spirv/writer/writer_test.cc
+++ b/src/tint/lang/spirv/writer/writer_test.cc
@@ -183,8 +183,6 @@
 
                ; Annotations
                OpDecorate %gl_LocalInvocationIndex BuiltIn LocalInvocationIndex
-               OpMemberDecorate %_struct_11 0 Offset 0
-               OpMemberDecorate %_struct_11 1 Offset 16
 
                ; Types, variables and constants
        %uint = OpTypeInt 32 0
diff --git a/test/tint/access/ptr.wgsl.expected.spvasm b/test/tint/access/ptr.wgsl.expected.spvasm
index faee905..4bbe212 100644
--- a/test/tint/access/ptr.wgsl.expected.spvasm
+++ b/test/tint/access/ptr.wgsl.expected.spvasm
@@ -44,8 +44,6 @@
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/array/assign_to_function_var.wgsl.expected.spvasm b/test/tint/array/assign_to_function_var.wgsl.expected.spvasm
index 92f61a9..d5a5c65 100644
--- a/test/tint/array/assign_to_function_var.wgsl.expected.spvasm
+++ b/test/tint/array/assign_to_function_var.wgsl.expected.spvasm
@@ -42,9 +42,6 @@
                OpDecorate %15 Binding 1
                OpDecorate %15 Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_2_uint_3 ArrayStride 8
-               OpDecorate %_arr__arr__arr_int_uint_2_uint_3_uint_4 ArrayStride 24
         %int = OpTypeInt 32 1
       %v4int = OpTypeVector %int 4
        %uint = OpTypeInt 32 0
diff --git a/test/tint/array/assign_to_private_var.wgsl.expected.spvasm b/test/tint/array/assign_to_private_var.wgsl.expected.spvasm
index 8bfaff4..e66b3c9 100644
--- a/test/tint/array/assign_to_private_var.wgsl.expected.spvasm
+++ b/test/tint/array/assign_to_private_var.wgsl.expected.spvasm
@@ -41,9 +41,6 @@
                OpDecorate %15 DescriptorSet 0
                OpDecorate %15 Binding 1
                OpDecorate %15 Coherent
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_2_uint_3 ArrayStride 8
-               OpDecorate %_arr__arr__arr_int_uint_2_uint_3_uint_4 ArrayStride 24
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %v4int = OpTypeVector %int 4
diff --git a/test/tint/array/assign_to_subexpr.wgsl.expected.spvasm b/test/tint/array/assign_to_subexpr.wgsl.expected.spvasm
index fc3f02a..91d5d4a 100644
--- a/test/tint/array/assign_to_subexpr.wgsl.expected.spvasm
+++ b/test/tint/array/assign_to_subexpr.wgsl.expected.spvasm
@@ -25,9 +25,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr__arr_int_uint_4_uint_2 ArrayStride 16
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/array/assign_to_workgroup_var.wgsl.expected.spvasm b/test/tint/array/assign_to_workgroup_var.wgsl.expected.spvasm
index 790f916..347601a 100644
--- a/test/tint/array/assign_to_workgroup_var.wgsl.expected.spvasm
+++ b/test/tint/array/assign_to_workgroup_var.wgsl.expected.spvasm
@@ -41,9 +41,6 @@
                OpDecorate %15 DescriptorSet 0
                OpDecorate %15 Binding 1
                OpDecorate %15 Coherent
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_2_uint_3 ArrayStride 8
-               OpDecorate %_arr__arr__arr_int_uint_2_uint_3_uint_4 ArrayStride 24
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %v4int = OpTypeVector %int 4
diff --git a/test/tint/array/function_parameter.wgsl.expected.spvasm b/test/tint/array/function_parameter.wgsl.expected.spvasm
index b8447b5..444d890 100644
--- a/test/tint/array/function_parameter.wgsl.expected.spvasm
+++ b/test/tint/array/function_parameter.wgsl.expected.spvasm
@@ -27,9 +27,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_4_uint_3 ArrayStride 16
-               OpDecorate %_arr__arr__arr_float_uint_4_uint_3_uint_2 ArrayStride 48
       %float = OpTypeFloat 32
     %s_block = OpTypeStruct %float
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/array/function_return_type.wgsl.expected.spvasm b/test/tint/array/function_return_type.wgsl.expected.spvasm
index 6a17ef2..9736b3e 100644
--- a/test/tint/array/function_return_type.wgsl.expected.spvasm
+++ b/test/tint/array/function_return_type.wgsl.expected.spvasm
@@ -21,9 +21,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_4_uint_3 ArrayStride 16
-               OpDecorate %_arr__arr__arr_float_uint_4_uint_3_uint_2 ArrayStride 48
       %float = OpTypeFloat 32
     %s_block = OpTypeStruct %float
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/array/size.wgsl.expected.spvasm b/test/tint/array/size.wgsl.expected.spvasm
index a090616..5f3578b 100644
--- a/test/tint/array/size.wgsl.expected.spvasm
+++ b/test/tint/array/size.wgsl.expected.spvasm
@@ -20,7 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
       %float = OpTypeFloat 32
     %s_block = OpTypeStruct %float
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/array/strides.spvasm.expected.spvasm b/test/tint/array/strides.spvasm.expected.spvasm
index 8b47afe..7527029 100644
--- a/test/tint/array/strides.spvasm.expected.spvasm
+++ b/test/tint/array/strides.spvasm.expected.spvasm
@@ -46,9 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
-               OpDecorate %_arr_uint_uint_3 ArrayStride 4
       %float = OpTypeFloat 32
 %strided_arr = OpTypeStruct %float
        %uint = OpTypeInt 32 0
diff --git a/test/tint/array/type_initializer.wgsl.expected.spvasm b/test/tint/array/type_initializer.wgsl.expected.spvasm
index 8f1175a..1be5596 100644
--- a/test/tint/array/type_initializer.wgsl.expected.spvasm
+++ b/test/tint/array/type_initializer.wgsl.expected.spvasm
@@ -28,10 +28,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_4_uint_3 ArrayStride 16
-               OpDecorate %_arr__arr__arr_int_uint_4_uint_3_uint_2 ArrayStride 48
-               OpDecorate %_arr__arr_int_uint_4_uint_2 ArrayStride 16
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.spvasm b/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.spvasm
index 2ff52f6..cd74779 100644
--- a/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.spvasm
+++ b/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.spvasm
@@ -98,7 +98,6 @@
                OpDecorate %sb Binding 0
                OpDecorate %sb Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.spvasm b/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.spvasm
index df8e627..d91c6c5 100644
--- a/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.spvasm
+++ b/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.spvasm
@@ -159,7 +159,6 @@
                OpDecorate %sb Binding 0
                OpDecorate %sb Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/buffer/storage/static_index/write_f16.wgsl.expected.spvasm b/test/tint/buffer/storage/static_index/write_f16.wgsl.expected.spvasm
index 36644f0..a55d43d 100644
--- a/test/tint/buffer/storage/static_index/write_f16.wgsl.expected.spvasm
+++ b/test/tint/buffer/storage/static_index/write_f16.wgsl.expected.spvasm
@@ -164,7 +164,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.spvasm b/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.spvasm
index 6c0953f..d5620fe 100644
--- a/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.spvasm
@@ -224,7 +224,6 @@
                OpDecorate %31 Binding 1
                OpDecorate %31 Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_mat4v2half_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/buffer/uniform/static_index/read_f16.wgsl.expected.spvasm b/test/tint/buffer/uniform/static_index/read_f16.wgsl.expected.spvasm
index 3295757..5d1c2e7 100644
--- a/test/tint/buffer/uniform/static_index/read_f16.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/static_index/read_f16.wgsl.expected.spvasm
@@ -229,7 +229,6 @@
                OpDecorate %31 DescriptorSet 0
                OpDecorate %31 Binding 1
                OpDecorate %31 Coherent
-               OpDecorate %_arr_mat4v2half_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/buffer/uniform/std140/array/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 19089c3..984cb0c 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -34,7 +34,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v2float_uint_4 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2x2_f32_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
index 67fd110..a5c9322 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v2float_uint_4 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2x2_f32_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_fn.wgsl.expected.spvasm
index e265ba7..d06a488 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_fn.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v2float_uint_4 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2x2_f32_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_private.wgsl.expected.spvasm
index 2b2bdc1..6f6500a 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_private.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v2float_uint_4 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2x2_f32_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
index d8dce72..99fbd6c 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
@@ -25,7 +25,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat2v2float_uint_4 ArrayStride 16
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 2c7d701..d70600c 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat2x3_f16_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
index 9def70c..85929a8 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -34,7 +34,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat2x3_f16_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_fn.wgsl.expected.spvasm
index d1b3c5b..dbe3d6c 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_fn.wgsl.expected.spvasm
@@ -39,7 +39,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat2x3_f16_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_private.wgsl.expected.spvasm
index fac5347..8d88867 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_private.wgsl.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat2x3_f16_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_storage.wgsl.expected.spvasm
index 005cd6e..c749a48 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_storage.wgsl.expected.spvasm
@@ -39,7 +39,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat2x3_f16_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
index ab399ea..942495c 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
@@ -35,7 +35,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3half_uint_4 ArrayStride 16
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 95f2d6e..df976af 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -34,7 +34,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat2x3_f32_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index fdf163a..0efae22 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat2x3_f32_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_fn.wgsl.expected.spvasm
index 8f5f0b8..aa7f505 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_fn.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat2x3_f32_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_private.wgsl.expected.spvasm
index c552ba3..c6b7127 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_private.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v3float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat2x3_f32_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_storage.wgsl.expected.spvasm
index b071e7e..8eb05da 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_storage.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat2x3_f32_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
index 86a591d..7865902 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -25,7 +25,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat2v3float_uint_4 ArrayStride 32
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/array/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 804dcc9..0398f09 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v4half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat2x4_f16_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
index 3c14282..ce80f35 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -34,7 +34,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v4half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat2x4_f16_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_fn.wgsl.expected.spvasm
index 092d72b..b62984a 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_fn.wgsl.expected.spvasm
@@ -39,7 +39,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v4half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat2x4_f16_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_private.wgsl.expected.spvasm
index a81f542..5bc3acd 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_private.wgsl.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat2v4half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat2x4_f16_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
index 073c7c2..0762b39 100644
--- a/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat2v4half_uint_4 ArrayStride 16
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 6b91c2b..0c19e8b 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat3v3float_uint_4 ArrayStride 48
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index 9fc3085..8123305 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -33,7 +33,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat3v3float_uint_4 ArrayStride 48
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_fn.wgsl.expected.spvasm
index fbe8158..0b9ceb7f 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_fn.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat3v3float_uint_4 ArrayStride 48
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_private.wgsl.expected.spvasm
index 68df78d..34da456 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_private.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat3v3float_uint_4 ArrayStride 48
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_storage.wgsl.expected.spvasm
index c8c515f..7359376 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_storage.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
index c33c5be..47a9ea1 100644
--- a/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -27,7 +27,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat3v3float_uint_4 ArrayStride 48
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 188122b..e284b00 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -41,7 +41,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %mat4x2_f16_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
index f6f817f..5ec3396 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %mat4x2_f16_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_fn.wgsl.expected.spvasm
index ef2c640..d3b3470 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_fn.wgsl.expected.spvasm
@@ -43,7 +43,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %mat4x2_f16_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_private.wgsl.expected.spvasm
index a63a438..4cd0769 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_private.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2half_uint_4 ArrayStride 16
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %mat4x2_f16_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
index 992aa4e..7e33fe0 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat4v2half_uint_4 ArrayStride 16
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 7b9b140..d936c6a 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat4x2_f32_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
index 629d4b1..13c816a 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -35,7 +35,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat4x2_f32_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_fn.wgsl.expected.spvasm
index 7e62a5d..f5dfe4a 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_fn.wgsl.expected.spvasm
@@ -40,7 +40,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat4x2_f32_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_private.wgsl.expected.spvasm
index ca35907..d49c1aa 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_private.wgsl.expected.spvasm
@@ -33,7 +33,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v2float_uint_4 ArrayStride 32
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat4x2_f32_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
index 46e1f21..3614a31 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat4v2float_uint_4 ArrayStride 32
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 9ec179a..198fc43 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -41,7 +41,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat4x3_f16_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
index a0519fe..aa0200f 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat4x3_f16_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_fn.wgsl.expected.spvasm
index 41fc632..827db35 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_fn.wgsl.expected.spvasm
@@ -43,7 +43,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat4x3_f16_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_private.wgsl.expected.spvasm
index 26d8095..3db3bda 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_private.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat4x3_f16_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_storage.wgsl.expected.spvasm
index 9dcd5b8..d4a4de2 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_storage.wgsl.expected.spvasm
@@ -43,7 +43,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %mat4x3_f16_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
index 12f1e68..9b64dac 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat4v3half_uint_4 ArrayStride 32
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 3fbe569..6f8f2f3 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3float_uint_4 ArrayStride 64
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat4x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index ed662c9..bcc4433 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -35,7 +35,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3float_uint_4 ArrayStride 64
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat4x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_fn.wgsl.expected.spvasm
index dc54d76..2573b2a 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_fn.wgsl.expected.spvasm
@@ -40,7 +40,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3float_uint_4 ArrayStride 64
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat4x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_private.wgsl.expected.spvasm
index 99c212e..147fc40 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_private.wgsl.expected.spvasm
@@ -33,7 +33,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v3float_uint_4 ArrayStride 64
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat4x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_storage.wgsl.expected.spvasm
index daf554c..a3a361b 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_storage.wgsl.expected.spvasm
@@ -40,7 +40,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat4x3_f32_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
index db320eb..19538c6 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat4v3float_uint_4 ArrayStride 64
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/array/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 96a20e4..827a151 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -41,7 +41,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v4half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat4x4_f16_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
index cc04f02..4d7d093 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -38,7 +38,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v4half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat4x4_f16_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_fn.wgsl.expected.spvasm
index 979d33c..b0bba5c 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_fn.wgsl.expected.spvasm
@@ -43,7 +43,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v4half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat4x4_f16_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_private.wgsl.expected.spvasm
index 1fd63d0..513dbde 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_private.wgsl.expected.spvasm
@@ -36,7 +36,6 @@
                OpDecorate %10 DescriptorSet 0
                OpDecorate %10 Binding 1
                OpDecorate %10 Coherent
-               OpDecorate %_arr_mat4v4half_uint_4 ArrayStride 32
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %mat4x4_f16_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
index daf1c6e..f0852cd 100644
--- a/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/array/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_mat4v4half_uint_4 ArrayStride 32
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index f7a0240..0a294a6 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/static_index_via_ptr.wgsl.expected.spvasm
index 6fc0bb5..d3f4fdf 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_fn.wgsl.expected.spvasm
index 34f30f5..7206445 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_fn.wgsl.expected.spvasm
@@ -44,12 +44,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_private.wgsl.expected.spvasm
index aa83d5e..6cc5d76 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_private.wgsl.expected.spvasm
@@ -35,12 +35,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_storage.wgsl.expected.spvasm
index 4b73b9f..ea21433 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_storage.wgsl.expected.spvasm
@@ -52,7 +52,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_workgroup.wgsl.expected.spvasm
index dae0dbf..93fdd08 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_workgroup.wgsl.expected.spvasm
@@ -38,12 +38,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index f94511f..c934486 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
index be4634e..b22350d 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -40,12 +40,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_fn.wgsl.expected.spvasm
index f566d6e..f891280 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_fn.wgsl.expected.spvasm
@@ -41,12 +41,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_private.wgsl.expected.spvasm
index b62b2e2..d0c86c6 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_private.wgsl.expected.spvasm
@@ -32,12 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_storage.wgsl.expected.spvasm
index 2a033fd..74e3346 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_storage.wgsl.expected.spvasm
@@ -49,7 +49,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
index ec15f46..6f29af7 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x2_f32/to_workgroup.wgsl.expected.spvasm
@@ -35,12 +35,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 7661627..3865527 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
index 219ef79..66f4503 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_fn.wgsl.expected.spvasm
index 129f128..d1eb645 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_fn.wgsl.expected.spvasm
@@ -44,12 +44,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_private.wgsl.expected.spvasm
index d68df42..ccccd78 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_private.wgsl.expected.spvasm
@@ -35,12 +35,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_storage.wgsl.expected.spvasm
index 8941fe0..4a4d8a1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_storage.wgsl.expected.spvasm
@@ -55,7 +55,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
index 6d565e4f..eb81d52 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_workgroup.wgsl.expected.spvasm
@@ -38,12 +38,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 76d3364..f078b4c 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index b8523ba..e105a8b 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -40,12 +40,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_fn.wgsl.expected.spvasm
index 2a222cf..f7dca79 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_fn.wgsl.expected.spvasm
@@ -41,12 +41,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_private.wgsl.expected.spvasm
index 1587b42..1b841b1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_private.wgsl.expected.spvasm
@@ -32,12 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_storage.wgsl.expected.spvasm
index ca2e0d2..87efca6 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_storage.wgsl.expected.spvasm
@@ -52,7 +52,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
index a302a5f..7a7e44a 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -35,12 +35,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 051896b..b748c34 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
index 35a088b..65662c8 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_fn.wgsl.expected.spvasm
index 0776b84..f6f48bc 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_fn.wgsl.expected.spvasm
@@ -44,12 +44,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_private.wgsl.expected.spvasm
index 4e3865e..2b6db6e 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_private.wgsl.expected.spvasm
@@ -35,12 +35,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_storage.wgsl.expected.spvasm
index 0bc007a..bf8bbe1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_storage.wgsl.expected.spvasm
@@ -52,7 +52,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
index 784069e..5409de4 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_workgroup.wgsl.expected.spvasm
@@ -38,12 +38,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat2x4_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat2x4_f32/to_storage.wgsl.expected.spvasm
index af47523..7b08809 100644
--- a/test/tint/buffer/uniform/std140/struct/mat2x4_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat2x4_f32/to_storage.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpDecorate %12 DescriptorSet 0
                OpDecorate %12 Binding 1
                OpDecorate %12 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index c3a9f48..89a87fa 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/static_index_via_ptr.wgsl.expected.spvasm
index cc26f92..8cef485 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_fn.wgsl.expected.spvasm
index cdb3332..b0cbc34 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_fn.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_private.wgsl.expected.spvasm
index 1ec095f..9f70835 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_private.wgsl.expected.spvasm
@@ -37,12 +37,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_storage.wgsl.expected.spvasm
index aa7619f..ec4ba71 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_storage.wgsl.expected.spvasm
@@ -54,7 +54,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_workgroup.wgsl.expected.spvasm
index e488f1c..219662e 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_workgroup.wgsl.expected.spvasm
@@ -40,12 +40,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index fe95e46..0e9f933 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/static_index_via_ptr.wgsl.expected.spvasm
index ee30805..79417f1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_fn.wgsl.expected.spvasm
index abb8473..3fd333e 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_fn.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_private.wgsl.expected.spvasm
index da8408e..f6afb26 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_private.wgsl.expected.spvasm
@@ -34,12 +34,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_storage.wgsl.expected.spvasm
index 61dd700..4ed39c1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_storage.wgsl.expected.spvasm
@@ -51,7 +51,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_workgroup.wgsl.expected.spvasm
index 8281f8c..4b88742 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x2_f32/to_workgroup.wgsl.expected.spvasm
@@ -37,12 +37,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 3d6fa8e..f4ad7e4 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/static_index_via_ptr.wgsl.expected.spvasm
index 84c739f..83455f7 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_fn.wgsl.expected.spvasm
index c44b395..018b962 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_fn.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_private.wgsl.expected.spvasm
index 6bfa2df..f399430 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_private.wgsl.expected.spvasm
@@ -37,12 +37,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_storage.wgsl.expected.spvasm
index d855db8..435d323 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_storage.wgsl.expected.spvasm
@@ -57,7 +57,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_workgroup.wgsl.expected.spvasm
index c9bab5a..6de2b19 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_workgroup.wgsl.expected.spvasm
@@ -40,12 +40,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 555542c..576f0f5 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index 7168311..4bb457d 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_fn.wgsl.expected.spvasm
index 4a9192c..1fd8e70 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_fn.wgsl.expected.spvasm
@@ -43,12 +43,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_private.wgsl.expected.spvasm
index 21e276f..89db912 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_private.wgsl.expected.spvasm
@@ -34,12 +34,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_storage.wgsl.expected.spvasm
index 6faa05f..4fdc992 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_storage.wgsl.expected.spvasm
@@ -54,7 +54,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
index ea606ef..6d461ad 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -37,12 +37,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 4845317..f9424a1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/static_index_via_ptr.wgsl.expected.spvasm
index b079419..5f6c668 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_fn.wgsl.expected.spvasm
index c678e00..c011c97 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_fn.wgsl.expected.spvasm
@@ -46,12 +46,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_private.wgsl.expected.spvasm
index 5533b91d..f3eb505 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_private.wgsl.expected.spvasm
@@ -37,12 +37,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_storage.wgsl.expected.spvasm
index ca7d5c5..15c1cdf 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_storage.wgsl.expected.spvasm
@@ -54,7 +54,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_workgroup.wgsl.expected.spvasm
index 893b522..aee6af9 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_workgroup.wgsl.expected.spvasm
@@ -40,12 +40,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat3x4_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat3x4_f32/to_storage.wgsl.expected.spvasm
index a1acf35..f6cd621 100644
--- a/test/tint/buffer/uniform/std140/struct/mat3x4_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat3x4_f32/to_storage.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpDecorate %12 DescriptorSet 0
                OpDecorate %12 Binding 1
                OpDecorate %12 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 9053993..47054ca 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -50,12 +50,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
index 47ecd58..c3775a1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -47,12 +47,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 4
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
 %Inner_std140 = OpTypeStruct %v2half %v2half %v2half %v2half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_fn.wgsl.expected.spvasm
index f7c93e4..7328bb8 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_fn.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_private.wgsl.expected.spvasm
index 7ae505d..f3cd5f8 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_private.wgsl.expected.spvasm
@@ -39,12 +39,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_storage.wgsl.expected.spvasm
index abdaa45..2126f0c 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_storage.wgsl.expected.spvasm
@@ -56,7 +56,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v2half = OpTypeVector %half 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
index 8a18338..df2253f 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_workgroup.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 4
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 3555189..3aaab02 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -47,12 +47,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
index 6ae5d82..449dcf54 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -44,12 +44,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %Inner_std140 = OpTypeStruct %v2float %v2float %v2float %v2float
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_fn.wgsl.expected.spvasm
index 954ce1d..8b769a1 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_fn.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_private.wgsl.expected.spvasm
index 3a7aa04..ef515c9 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_private.wgsl.expected.spvasm
@@ -36,12 +36,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_storage.wgsl.expected.spvasm
index 83daa46..b8ae73c 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_storage.wgsl.expected.spvasm
@@ -53,7 +53,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
index 3d4480f..a65b838 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x2_f32/to_workgroup.wgsl.expected.spvasm
@@ -39,12 +39,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index d99ff6e..87c904f 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -50,12 +50,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
index dcdff30..9b5237d 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -47,12 +47,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
 %Inner_std140 = OpTypeStruct %v3half %v3half %v3half %v3half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_fn.wgsl.expected.spvasm
index 38dbc98..be77ae0 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_fn.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_private.wgsl.expected.spvasm
index c768507..1c04cf2 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_private.wgsl.expected.spvasm
@@ -39,12 +39,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_storage.wgsl.expected.spvasm
index d11f5d2..5ceb129 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_storage.wgsl.expected.spvasm
@@ -59,7 +59,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
index 7a7c026..4361702 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_workgroup.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
index 06b842b..42ad1bc 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -47,12 +47,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
index a12389b..276cf8e 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/static_index_via_ptr.wgsl.expected.spvasm
@@ -44,12 +44,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %Inner_std140 = OpTypeStruct %v3float %v3float %v3float %v3float
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_fn.wgsl.expected.spvasm
index 88c6535..bc34ac5 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_fn.wgsl.expected.spvasm
@@ -45,12 +45,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 128
-               OpDecorate %_arr_S_uint_4 ArrayStride 192
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_private.wgsl.expected.spvasm
index 4e66752..7b47107 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_private.wgsl.expected.spvasm
@@ -36,12 +36,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 128
-               OpDecorate %_arr_S_uint_4 ArrayStride 192
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_storage.wgsl.expected.spvasm
index d1da6ff..c98910e 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_storage.wgsl.expected.spvasm
@@ -56,7 +56,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
index 849abfa..0bc9bb7 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x3_f32/to_workgroup.wgsl.expected.spvasm
@@ -39,12 +39,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
-               OpMemberDecorate %S 2 Offset 128
-               OpDecorate %_arr_S_uint_4 ArrayStride 192
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
index 8912b92..d4826b6 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.spvasm
@@ -50,12 +50,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
index efa8f95..34c45a4 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/static_index_via_ptr.wgsl.expected.spvasm
@@ -47,12 +47,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 0 ColMajor
-               OpMemberDecorate %Inner 0 MatrixStride 8
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 64
-               OpMemberDecorate %Outer 0 Offset 0
-               OpDecorate %_arr_Outer_uint_4 ArrayStride 256
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
 %Inner_std140 = OpTypeStruct %v4half %v4half %v4half %v4half
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_fn.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_fn.wgsl.expected.spvasm
index ba0d549..d14cfd4 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_fn.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_fn.wgsl.expected.spvasm
@@ -48,12 +48,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_private.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_private.wgsl.expected.spvasm
index 674af17..95d5f50 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_private.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_private.wgsl.expected.spvasm
@@ -39,12 +39,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_storage.wgsl.expected.spvasm
index 29ac4e0..9722a9f 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_storage.wgsl.expected.spvasm
@@ -56,7 +56,6 @@
                OpDecorate %11 DescriptorSet 0
                OpDecorate %11 Binding 1
                OpDecorate %11 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
      %v4half = OpTypeVector %half 4
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_workgroup.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
index ba82c93..133b88f 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_workgroup.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 8
-               OpMemberDecorate %S 2 Offset 64
-               OpDecorate %_arr_S_uint_4 ArrayStride 128
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %half = OpTypeFloat 16
diff --git a/test/tint/buffer/uniform/std140/struct/mat4x4_f32/to_storage.wgsl.expected.spvasm b/test/tint/buffer/uniform/std140/struct/mat4x4_f32/to_storage.wgsl.expected.spvasm
index 6632c05..72cb1c5 100644
--- a/test/tint/buffer/uniform/std140/struct/mat4x4_f32/to_storage.wgsl.expected.spvasm
+++ b/test/tint/buffer/uniform/std140/struct/mat4x4_f32/to_storage.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpDecorate %12 DescriptorSet 0
                OpDecorate %12 Binding 1
                OpDecorate %12 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/bug/chromium/1251009.wgsl.expected.spvasm b/test/tint/bug/chromium/1251009.wgsl.expected.spvasm
index 1de75b1..820faa4 100644
--- a/test/tint/bug/chromium/1251009.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1251009.wgsl.expected.spvasm
@@ -35,10 +35,6 @@
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs0 0 Offset 0
-               OpMemberDecorate %VertexInputs0 1 Offset 4
-               OpMemberDecorate %VertexInputs1 0 Offset 0
-               OpMemberDecorate %VertexInputs1 1 Offset 16
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/bug/chromium/1273451.wgsl.expected.spvasm b/test/tint/bug/chromium/1273451.wgsl.expected.spvasm
index ce3d04c..3898a1a 100644
--- a/test/tint/bug/chromium/1273451.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1273451.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %A "A"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %B 0 Offset 0
-               OpMemberDecorate %A 0 Offset 0
         %int = OpTypeInt 32 1
           %B = OpTypeStruct %int
           %A = OpTypeStruct %int
diff --git a/test/tint/bug/chromium/1367602_function_space_initializer_valid_count.wgsl.expected.spvasm b/test/tint/bug/chromium/1367602_function_space_initializer_valid_count.wgsl.expected.spvasm
index 218f128..d2f8939 100644
--- a/test/tint/bug/chromium/1367602_function_space_initializer_valid_count.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1367602_function_space_initializer_valid_count.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_bool_uint_65535 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/bug/chromium/1367602_function_space_no_initializer_valid_count.wgsl.expected.spvasm b/test/tint/bug/chromium/1367602_function_space_no_initializer_valid_count.wgsl.expected.spvasm
index 9d67b10..62ff4563 100644
--- a/test/tint/bug/chromium/1367602_function_space_no_initializer_valid_count.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1367602_function_space_no_initializer_valid_count.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_bool_uint_65535 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/bug/chromium/1367602_private_space_initializer_valid_count.wgsl.expected.spvasm b/test/tint/bug/chromium/1367602_private_space_initializer_valid_count.wgsl.expected.spvasm
index d45f6fc..b44a50f 100644
--- a/test/tint/bug/chromium/1367602_private_space_initializer_valid_count.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1367602_private_space_initializer_valid_count.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %v "v"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_bool_uint_65535 ArrayStride 4
        %bool = OpTypeBool
        %uint = OpTypeInt 32 0
  %uint_65535 = OpConstant %uint 65535
diff --git a/test/tint/bug/chromium/1367602_private_space_no_initializer_valid_count.wgsl.expected.spvasm b/test/tint/bug/chromium/1367602_private_space_no_initializer_valid_count.wgsl.expected.spvasm
index d45f6fc..b44a50f 100644
--- a/test/tint/bug/chromium/1367602_private_space_no_initializer_valid_count.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1367602_private_space_no_initializer_valid_count.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %v "v"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_bool_uint_65535 ArrayStride 4
        %bool = OpTypeBool
        %uint = OpTypeInt 32 0
  %uint_65535 = OpConstant %uint 65535
diff --git a/test/tint/bug/chromium/1417515.wgsl.expected.spvasm b/test/tint/bug/chromium/1417515.wgsl.expected.spvasm
index 3c7e53e..d56f14b 100644
--- a/test/tint/bug/chromium/1417515.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1417515.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %s1 "s1"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/bug/chromium/1430309.wgsl.expected.spvasm b/test/tint/bug/chromium/1430309.wgsl.expected.spvasm
index 31bd86a..39c6b7d 100644
--- a/test/tint/bug/chromium/1430309.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1430309.wgsl.expected.spvasm
@@ -17,9 +17,6 @@
                OpName %main_loc0_Output "main_loc0_Output"
                OpName %main_inner "main_inner"
                OpName %main "main"
-               OpMemberDecorate %frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
                OpDecorate %main_loc0_Output Location 0
       %float = OpTypeFloat 32
 %frexp_result_f32 = OpTypeStruct %float
diff --git a/test/tint/bug/chromium/1434271.wgsl.expected.spvasm b/test/tint/bug/chromium/1434271.wgsl.expected.spvasm
index 3a06453..7cf0988 100644
--- a/test/tint/bug/chromium/1434271.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1434271.wgsl.expected.spvasm
@@ -193,12 +193,6 @@
                OpDecorate %vs_main_loc0_Output Location 0
                OpDecorate %vs_main_loc1_Output Location 1
                OpDecorate %vs_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
-               OpMemberDecorate %VertexOutput 2 Offset 32
-               OpMemberDecorate %VertexInput 0 Offset 0
-               OpMemberDecorate %VertexInput 1 Offset 16
-               OpMemberDecorate %VertexInput 2 Offset 32
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
@@ -346,7 +340,6 @@
                OpDecorate %data Binding 1
                OpDecorate %data Coherent
                OpDecorate %simulate_global_invocation_id_Input BuiltIn GlobalInvocationId
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %_ptr_Private_v2float = OpTypePointer Private %v2float
diff --git a/test/tint/bug/chromium/1449474.wgsl.expected.spvasm b/test/tint/bug/chromium/1449474.wgsl.expected.spvasm
index db4cc98..b4f8d8e 100644
--- a/test/tint/bug/chromium/1449474.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1449474.wgsl.expected.spvasm
@@ -10,71 +10,6 @@
                OpName %arr "arr"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr_int_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr__arr_int_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_1 = OpConstant %uint 1
diff --git a/test/tint/bug/dawn/947.wgsl.expected.spvasm b/test/tint/bug/dawn/947.wgsl.expected.spvasm
index e15f93d..5b29ddc 100644
--- a/test/tint/bug/dawn/947.wgsl.expected.spvasm
+++ b/test/tint/bug/dawn/947.wgsl.expected.spvasm
@@ -39,9 +39,6 @@
                OpDecorate %vs_main_loc0_Output Location 0
                OpDecorate %vs_main_position_Output BuiltIn Position
                OpDecorate %vs_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
-               OpDecorate %_arr_v2float_uint_3 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
    %Uniforms = OpTypeStruct %v2float %v2float
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.spvasm
index f0fd2a0..249ff1b 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.spvasm
@@ -32,8 +32,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.spvasm
index eddfd86..7b40084 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.spvasm
@@ -32,8 +32,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.spvasm
index d1f8de1..25b70a9 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.spvasm
@@ -35,8 +35,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.spvasm
index 89f6d78..7569fd8 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.spvasm
@@ -32,8 +32,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.spvasm
index 95d0b0a..138fd9f 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.spvasm
@@ -34,8 +34,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.spvasm
index 96a8864..34c4a64 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.spvasm
@@ -32,8 +32,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.spvasm
index 16c9e10..b312c07 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.spvasm
@@ -33,8 +33,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
   %ubo_block = OpTypeStruct %UBO
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.spvasm b/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.spvasm
index 9ab1a0c..0cfe1b1 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.spvasm
+++ b/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.spvasm
@@ -35,8 +35,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 1
                OpDecorate %6 Coherent
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
                OpDecorate %f_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
         %UBO = OpTypeStruct %int
diff --git a/test/tint/bug/tint/1046.wgsl.expected.spvasm b/test/tint/bug/tint/1046.wgsl.expected.spvasm
index 725cfb9..6d22810 100644
--- a/test/tint/bug/tint/1046.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1046.wgsl.expected.spvasm
@@ -71,12 +71,6 @@
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %FragmentOutput 0 Offset 0
-               OpMemberDecorate %FragmentInput 0 Offset 0
-               OpMemberDecorate %FragmentInput 1 Offset 16
-               OpMemberDecorate %FragmentInput 2 Offset 32
-               OpMemberDecorate %FragmentInput 3 Offset 48
-               OpMemberDecorate %FragmentInput 4 Offset 64
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
diff --git a/test/tint/bug/tint/1061.spvasm.expected.spvasm b/test/tint/bug/tint/1061.spvasm.expected.spvasm
index b397215..e93adce 100644
--- a/test/tint/bug/tint/1061.spvasm.expected.spvasm
+++ b/test/tint/bug/tint/1061.spvasm.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
        %buf0 = OpTypeStruct %v4float
diff --git a/test/tint/bug/tint/1076.wgsl.expected.spvasm b/test/tint/bug/tint/1076.wgsl.expected.spvasm
index 006a4be..0bf62d6 100644
--- a/test/tint/bug/tint/1076.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1076.wgsl.expected.spvasm
@@ -20,13 +20,10 @@
                OpName %b "b"
                OpName %main "main"
                OpDecorate %main_loc0_Input Location 0
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Input BuiltIn SampleMask
                OpDecorate %main_loc1_Input Location 1
                OpDecorate %main_loc0_Output Location 0
                OpDecorate %main_sample_mask_Output BuiltIn SampleMask
-               OpMemberDecorate %FragIn 0 Offset 0
-               OpMemberDecorate %FragIn 1 Offset 4
       %float = OpTypeFloat 32
 %_ptr_Input_float = OpTypePointer Input %float
 %main_loc0_Input = OpVariable %_ptr_Input_float Input
diff --git a/test/tint/bug/tint/1088.spvasm.expected.spvasm b/test/tint/bug/tint/1088.spvasm.expected.spvasm
index 55910aa..3531a2c 100644
--- a/test/tint/bug/tint/1088.spvasm.expected.spvasm
+++ b/test/tint/bug/tint/1088.spvasm.expected.spvasm
@@ -60,8 +60,6 @@
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main_loc0_Output Location 0
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %main_out 0 Offset 0
-               OpMemberDecorate %main_out 1 Offset 16
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %_ptr_Private_v3float = OpTypePointer Private %v3float
diff --git a/test/tint/bug/tint/1118.wgsl.expected.spvasm b/test/tint/bug/tint/1118.wgsl.expected.spvasm
index f2cbc5d..50b78ee 100644
--- a/test/tint/bug/tint/1118.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1118.wgsl.expected.spvasm
@@ -110,7 +110,6 @@
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
 %_ptr_Private_float = OpTypePointer Private %float
           %4 = OpConstantNull %float
diff --git a/test/tint/bug/tint/1121.wgsl.expected.spvasm b/test/tint/bug/tint/1121.wgsl.expected.spvasm
index 0180203..8457178 100644
--- a/test/tint/bug/tint/1121.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1121.wgsl.expected.spvasm
@@ -112,7 +112,6 @@
                OpDecorate %23 Binding 0
                OpDecorate %23 NonWritable
                OpDecorate %main_global_invocation_id_Input BuiltIn GlobalInvocationId
-               OpDecorate %_arr_v4float_uint_6 ArrayStride 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/bug/tint/1321.wgsl.expected.spvasm b/test/tint/bug/tint/1321.wgsl.expected.spvasm
index 224f7ed..7cc3b2c 100644
--- a/test/tint/bug/tint/1321.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1321.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %x "x"
                OpName %tint_low_inc "tint_low_inc"
                OpName %tint_carry "tint_carry"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
       %int_1 = OpConstant %int 1
diff --git a/test/tint/bug/tint/1520.spvasm.expected.spvasm b/test/tint/bug/tint/1520.spvasm.expected.spvasm
index 254bab1..4391f97 100644
--- a/test/tint/bug/tint/1520.spvasm.expected.spvasm
+++ b/test/tint/bug/tint/1520.spvasm.expected.spvasm
@@ -93,7 +93,6 @@
                OpDecorate %main_front_facing_Input BuiltIn FrontFacing
                OpDecorate %main_loc0_Input Location 0
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
     %v3float = OpTypeVector %float 3
diff --git a/test/tint/bug/tint/1540.wgsl.expected.spvasm b/test/tint/bug/tint/1540.wgsl.expected.spvasm
index 4e8cc00..fd68d9c 100644
--- a/test/tint/bug/tint/1540.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1540.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpMemberName %S 0 "e"
                OpName %S "S"
                OpName %v "v"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/bug/tint/1573.wgsl.expected.spvasm b/test/tint/bug/tint/1573.wgsl.expected.spvasm
index 69a3f42..04ceb85 100644
--- a/test/tint/bug/tint/1573.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1573.wgsl.expected.spvasm
@@ -20,8 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
     %a_block = OpTypeStruct %uint
 %_ptr_StorageBuffer_a_block = OpTypePointer StorageBuffer %a_block
diff --git a/test/tint/bug/tint/1574.wgsl.expected.spvasm b/test/tint/bug/tint/1574.wgsl.expected.spvasm
index 4b50b09..b3a3086 100644
--- a/test/tint/bug/tint/1574.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1574.wgsl.expected.spvasm
@@ -50,10 +50,6 @@
                OpDecorate %5 Binding 1
                OpDecorate %5 Coherent
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
        %uint = OpTypeInt 32 0
 %a_u32_block = OpTypeStruct %uint
 %_ptr_StorageBuffer_a_u32_block = OpTypePointer StorageBuffer %a_u32_block
diff --git a/test/tint/bug/tint/1598.wgsl.expected.spvasm b/test/tint/bug/tint/1598.wgsl.expected.spvasm
index 21ec288..227de5c 100644
--- a/test/tint/bug/tint/1598.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1598.wgsl.expected.spvasm
@@ -9,7 +9,6 @@
                OpExecutionMode %main OriginUpperLeft
                OpName %main "main"
                OpName %a "a"
-               OpDecorate %_arr_int_uint_5 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/bug/tint/1641.wgsl.expected.spvasm b/test/tint/bug/tint/1641.wgsl.expected.spvasm
index a55d867..fc181bd 100644
--- a/test/tint/bug/tint/1641.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1641.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Normals 0 Offset 0
-               OpDecorate %_arr_Normals_uint_1 ArrayStride 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/bug/tint/1653.wgsl.expected.spvasm b/test/tint/bug/tint/1653.wgsl.expected.spvasm
index 8ffc685..b8525c4 100644
--- a/test/tint/bug/tint/1653.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1653.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpDecorate %vs_main_vertex_index_Input BuiltIn VertexIndex
                OpDecorate %vs_main_position_Output BuiltIn Position
                OpDecorate %vs_main___point_size_Output BuiltIn PointSize
-               OpDecorate %_arr_v4float_uint_3 ArrayStride 16
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %vs_main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/bug/tint/1660.wgsl.expected.spvasm b/test/tint/bug/tint/1660.wgsl.expected.spvasm
index 1872f9b..e326b81 100644
--- a/test/tint/bug/tint/1660.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1660.wgsl.expected.spvasm
@@ -9,7 +9,6 @@
                OpExecutionMode %unused_entry_point LocalSize 1 1 1
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/bug/tint/1666.wgsl.expected.spvasm b/test/tint/bug/tint/1666.wgsl.expected.spvasm
index 803d9c3..1cbe90d 100644
--- a/test/tint/bug/tint/1666.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1666.wgsl.expected.spvasm
@@ -30,7 +30,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
       %float = OpTypeFloat 32
 %_runtimearr_float = OpTypeRuntimeArray %float
  %rarr_block = OpTypeStruct %_runtimearr_float
diff --git a/test/tint/bug/tint/1737.wgsl.expected.spvasm b/test/tint/bug/tint/1737.wgsl.expected.spvasm
index 13514b7..f520cb8 100644
--- a/test/tint/bug/tint/1737.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1737.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %x "x"
                OpName %y "y"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_10 ArrayStride 4
-               OpDecorate %_arr_float_uint_20 ArrayStride 4
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
     %uint_10 = OpConstant %uint 10
diff --git a/test/tint/bug/tint/1739.wgsl.expected.spvasm b/test/tint/bug/tint/1739.wgsl.expected.spvasm
index c98c6cb..0f60961 100644
--- a/test/tint/bug/tint/1739.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1739.wgsl.expected.spvasm
@@ -113,28 +113,6 @@
                OpDecorate %outImage DescriptorSet 0
                OpDecorate %outImage Binding 1
                OpDecorate %outImage NonReadable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/bug/tint/1764.wgsl.expected.spvasm b/test/tint/bug/tint/1764.wgsl.expected.spvasm
index d51ebb1..3651f63 100644
--- a/test/tint/bug/tint/1764.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1764.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %W "p"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_246 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/bug/tint/1963_b.wgsl.expected.spvasm b/test/tint/bug/tint/1963_b.wgsl.expected.spvasm
index 3b7ca25..d7f91bb 100644
--- a/test/tint/bug/tint/1963_b.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/1963_b.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
     %a_block = OpTypeStruct %int
 %_ptr_StorageBuffer_a_block = OpTypePointer StorageBuffer %a_block
diff --git a/test/tint/bug/tint/2010.spvasm.expected.spvasm b/test/tint/bug/tint/2010.spvasm.expected.spvasm
index 2f4d128..d18cd76 100644
--- a/test/tint/bug/tint/2010.spvasm.expected.spvasm
+++ b/test/tint/bug/tint/2010.spvasm.expected.spvasm
@@ -72,9 +72,6 @@
                OpName %x_3_param "x_3_param"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 8
-               OpDecorate %_arr_S_uint_4096 ArrayStride 16
                OpMemberDecorate %S_1 0 Offset 0
                OpMemberDecorate %S_2 0 Offset 0
                OpMemberDecorate %x_6_block 0 Offset 0
diff --git a/test/tint/bug/tint/2059.wgsl.expected.spvasm b/test/tint/bug/tint/2059.wgsl.expected.spvasm
index 1746340..9967479 100644
--- a/test/tint/bug/tint/2059.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/2059.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %33 DescriptorSet 0
                OpDecorate %33 Binding 7
                OpDecorate %33 Coherent
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
 %mat3v3float = OpTypeMatrix %v3float 3
diff --git a/test/tint/bug/tint/2069.wgsl.expected.spvasm b/test/tint/bug/tint/2069.wgsl.expected.spvasm
index 7220f03..d2efde3 100644
--- a/test/tint/bug/tint/2069.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/2069.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %v "v"
                OpName %main "main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
       %float = OpTypeFloat 32
 %__modf_result_f32 = OpTypeStruct %float %float
 %_ptr_Private___modf_result_f32 = OpTypePointer Private %__modf_result_f32
diff --git a/test/tint/bug/tint/2121.wgsl.expected.spvasm b/test/tint/bug/tint/2121.wgsl.expected.spvasm
index 7274566..bcbd554 100644
--- a/test/tint/bug/tint/2121.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/2121.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VSOut 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/bug/tint/2147.wgsl.expected.spvasm b/test/tint/bug/tint/2147.wgsl.expected.spvasm
index cc4c0e5..fb6c06c 100644
--- a/test/tint/bug/tint/2147.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/2147.wgsl.expected.spvasm
@@ -23,8 +23,6 @@
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
     %S_block = OpTypeStruct %int
 %_ptr_StorageBuffer_S_block = OpTypePointer StorageBuffer %S_block
diff --git a/test/tint/bug/tint/2237.wgsl.expected.spvasm b/test/tint/bug/tint/2237.wgsl.expected.spvasm
index 67ef7b2..f2059bc 100644
--- a/test/tint/bug/tint/2237.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/2237.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
        %uint = OpTypeInt 32 0
 %buffer_block = OpTypeStruct %uint
 %_ptr_StorageBuffer_buffer_block = OpTypePointer StorageBuffer %buffer_block
diff --git a/test/tint/bug/tint/349310442.wgsl.expected.spvasm b/test/tint/bug/tint/349310442.wgsl.expected.spvasm
index 8755a13..ef0ba3d 100644
--- a/test/tint/bug/tint/349310442.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/349310442.wgsl.expected.spvasm
@@ -108,28 +108,6 @@
                OpDecorate %6 DescriptorSet 0
                OpDecorate %6 Binding 2
                OpDecorate %6 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/bug/tint/379127084.wgsl.expected.spvasm b/test/tint/bug/tint/379127084.wgsl.expected.spvasm
index 52e2ea3..2cc3060 100644
--- a/test/tint/bug/tint/379127084.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/379127084.wgsl.expected.spvasm
@@ -143,9 +143,6 @@
                OpDecorate %main_loc0_Input Flat
                OpDecorate %main_loc1_Input Location 1
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %FSIn 0 Offset 0
-               OpMemberDecorate %FSIn 1 Offset 8
-               OpMemberDecorate %FSOut 0 Offset 0
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
         %int = OpTypeInt 32 1
diff --git a/test/tint/bug/tint/403.wgsl.expected.spvasm b/test/tint/bug/tint/403.wgsl.expected.spvasm
index f3cb92c..917d1e6 100644
--- a/test/tint/bug/tint/403.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/403.wgsl.expected.spvasm
@@ -46,7 +46,6 @@
                OpDecorate %main_vertex_index_Input BuiltIn VertexIndex
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpDecorate %_arr_v2float_uint_3 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %vertexUniformBuffer1_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/bug/tint/782.wgsl.expected.spvasm b/test/tint/bug/tint/782.wgsl.expected.spvasm
index 15092b8..9b259a9 100644
--- a/test/tint/bug/tint/782.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/782.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %explicitStride "explicitStride"
                OpName %implictStride "implictStride"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/bug/tint/824.wgsl.expected.spvasm b/test/tint/bug/tint/824.wgsl.expected.spvasm
index aafd46e..ce20ac5 100644
--- a/test/tint/bug/tint/824.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/824.wgsl.expected.spvasm
@@ -28,10 +28,6 @@
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main_loc0_Output Location 0
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Output 0 Offset 0
-               OpMemberDecorate %Output 1 Offset 16
-               OpDecorate %_arr_v2float_uint_4 ArrayStride 8
-               OpDecorate %_arr_v4float_uint_4 ArrayStride 16
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/bug/tint/914.wgsl.expected.spvasm b/test/tint/bug/tint/914.wgsl.expected.spvasm
index 7400da8..4050b1b 100644
--- a/test/tint/bug/tint/914.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/914.wgsl.expected.spvasm
@@ -99,13 +99,9 @@
                OpDecorate %9 DescriptorSet 0
                OpDecorate %9 Binding 3
                OpDecorate %9 NonWritable
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_64_uint_64 ArrayStride 256
                OpDecorate %main_local_invocation_id_Input BuiltIn LocalInvocationId
                OpDecorate %main_global_invocation_id_Input BuiltIn GlobalInvocationId
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_float_uint_16 ArrayStride 4
-               OpDecorate %_arr_float_ColPerThreadA ArrayStride 4
       %float = OpTypeFloat 32
 %_runtimearr_float = OpTypeRuntimeArray %float
      %Matrix = OpTypeStruct %_runtimearr_float
diff --git a/test/tint/bug/tint/922.wgsl.expected.spvasm b/test/tint/bug/tint/922.wgsl.expected.spvasm
index b01f7f0..a733272 100644
--- a/test/tint/bug/tint/922.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/922.wgsl.expected.spvasm
@@ -175,9 +175,6 @@
                OpDecorate %main_loc1_Output Location 1
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
-               OpMemberDecorate %VertexOutput 2 Offset 32
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
     %Mat4x4_ = OpTypeStruct %v4float %v4float %v4float %v4float
diff --git a/test/tint/bug/tint/942.wgsl.expected.spvasm b/test/tint/bug/tint/942.wgsl.expected.spvasm
index 0858ef7..59e679a 100644
--- a/test/tint/bug/tint/942.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/942.wgsl.expected.spvasm
@@ -69,8 +69,6 @@
                OpDecorate %16 DescriptorSet 1
                OpDecorate %16 Binding 3
                OpDecorate %16 NonWritable
-               OpDecorate %_arr_v3float_uint_256 ArrayStride 16
-               OpDecorate %_arr__arr_v3float_uint_256_uint_4 ArrayStride 4096
                OpDecorate %main_workgroup_id_Input BuiltIn WorkgroupId
                OpDecorate %main_local_invocation_id_Input BuiltIn LocalInvocationId
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
diff --git a/test/tint/bug/tint/948.wgsl.expected.spvasm b/test/tint/bug/tint/948.wgsl.expected.spvasm
index bb3308c..1c344cb 100644
--- a/test/tint/bug/tint/948.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/948.wgsl.expected.spvasm
@@ -192,7 +192,6 @@
                OpDecorate %main_loc0_Input Location 0
                OpDecorate %main_loc1_Input Location 1
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/bug/tint/949.wgsl.expected.spvasm b/test/tint/bug/tint/949.wgsl.expected.spvasm
index c2a750d..453b11a 100644
--- a/test/tint/bug/tint/949.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/949.wgsl.expected.spvasm
@@ -372,9 +372,6 @@
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %lightingInfo 0 Offset 0
-               OpMemberDecorate %lightingInfo 1 Offset 16
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
 %_ptr_Private_float = OpTypePointer Private %float
           %4 = OpConstantNull %float
diff --git a/test/tint/bug/tint/978.wgsl.expected.spvasm b/test/tint/bug/tint/978.wgsl.expected.spvasm
index b9b4535..6acf274 100644
--- a/test/tint/bug/tint/978.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/978.wgsl.expected.spvasm
@@ -27,8 +27,6 @@
                OpDecorate %texSampler Binding 3
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc0_Output Location 0
-               OpMemberDecorate %FragmentOutput 0 Offset 0
-               OpMemberDecorate %FragmentInput 0 Offset 0
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/bug/tint/998.wgsl.expected.spvasm b/test/tint/bug/tint/998.wgsl.expected.spvasm
index b491b25..8c28c22 100644
--- a/test/tint/bug/tint/998.wgsl.expected.spvasm
+++ b/test/tint/bug/tint/998.wgsl.expected.spvasm
@@ -22,8 +22,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_3 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %uint = OpTypeInt 32 0
   %Constants = OpTypeStruct %uint
 %constants_block = OpTypeStruct %Constants
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.spvasm
index 4b3f7d7..c388aa9 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.spvasm
@@ -31,9 +31,6 @@
                OpName %lhs_0 "lhs"
                OpName %rhs_0 "rhs"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr_uint_uint_1_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr__arr_uint_uint_1_uint_2_uint_3 ArrayStride 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.spvasm
index 3cdfd0d..d8aa928 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.spvasm
@@ -12,9 +12,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr_uint_uint_1_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr__arr_uint_uint_1_uint_2_uint_3 ArrayStride 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
      %uint_1 = OpConstant %uint 1
diff --git a/test/tint/builtins/atomicStore/array/array.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/array/array.spvasm.expected.spvasm
index 4511944..4547edc 100644
--- a/test/tint/builtins/atomicStore/array/array.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/array.spvasm.expected.spvasm
@@ -23,7 +23,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/array/array.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/array/array.wgsl.expected.spvasm
index 1feba90..e231df0 100644
--- a/test/tint/builtins/atomicStore/array/array.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.spvasm
index 4b3f7d7..c388aa9 100644
--- a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.spvasm
@@ -31,9 +31,6 @@
                OpName %lhs_0 "lhs"
                OpName %rhs_0 "rhs"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr_uint_uint_1_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr__arr_uint_uint_1_uint_2_uint_3 ArrayStride 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.spvasm
index 3cdfd0d..d8aa928 100644
--- a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.spvasm
@@ -12,9 +12,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
-               OpDecorate %_arr__arr_uint_uint_1_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr__arr_uint_uint_1_uint_2_uint_3 ArrayStride 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
      %uint_1 = OpConstant %uint 1
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.spvasm
index 7e46daf..17b3552 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.spvasm
@@ -27,10 +27,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S_atomic 0 Offset 0
-               OpMemberDecorate %S_atomic 1 Offset 4
-               OpMemberDecorate %S_atomic 2 Offset 8
-               OpDecorate %_arr_S_atomic_uint_10 ArrayStride 12
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.spvasm
index d2d42b0..efda0e7 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.spvasm
@@ -16,10 +16,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
-               OpDecorate %_arr_S_uint_10 ArrayStride 12
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.spvasm
index dd8dad0..c426e4e 100644
--- a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.spvasm
@@ -21,9 +21,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S_atomic 0 Offset 0
-               OpMemberDecorate %S_atomic 1 Offset 4
-               OpMemberDecorate %S_atomic 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.wgsl.expected.spvasm
index b498822..47b7c7b 100644
--- a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.wgsl.expected.spvasm
@@ -16,9 +16,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.spvasm
index 47698cf..b119eaf 100644
--- a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.spvasm
@@ -21,9 +21,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S_atomic 0 Offset 0
-               OpMemberDecorate %S_atomic 1 Offset 4
-               OpMemberDecorate %S_atomic 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/flat_single_atomic.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/flat_single_atomic.wgsl.expected.spvasm
index 0cb1228..1f41b11 100644
--- a/test/tint/builtins/atomicStore/struct/flat_single_atomic.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/flat_single_atomic.wgsl.expected.spvasm
@@ -16,9 +16,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.spvasm
index 56885a5..41517d1 100644
--- a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.spvasm
@@ -32,18 +32,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S2_atomic 0 Offset 0
-               OpMemberDecorate %S2_atomic 1 Offset 4
-               OpMemberDecorate %S2_atomic 2 Offset 8
-               OpMemberDecorate %S1_atomic 0 Offset 0
-               OpMemberDecorate %S0_atomic 0 Offset 0
-               OpMemberDecorate %S0_atomic 1 Offset 4
-               OpMemberDecorate %S0_atomic 2 Offset 8
-               OpMemberDecorate %S0_atomic 3 Offset 12
-               OpMemberDecorate %S1_atomic 1 Offset 4
-               OpMemberDecorate %S1_atomic 2 Offset 20
-               OpMemberDecorate %S1_atomic 3 Offset 24
-               OpMemberDecorate %S2_atomic 3 Offset 12
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/nested.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/nested.wgsl.expected.spvasm
index 9674fe8..f318a78 100644
--- a/test/tint/builtins/atomicStore/struct/nested.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/nested.wgsl.expected.spvasm
@@ -27,18 +27,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S2 0 Offset 0
-               OpMemberDecorate %S2 1 Offset 4
-               OpMemberDecorate %S2 2 Offset 8
-               OpMemberDecorate %S1 0 Offset 0
-               OpMemberDecorate %S0 0 Offset 0
-               OpMemberDecorate %S0 1 Offset 4
-               OpMemberDecorate %S0 2 Offset 8
-               OpMemberDecorate %S0 3 Offset 12
-               OpMemberDecorate %S1 1 Offset 4
-               OpMemberDecorate %S1 2 Offset 20
-               OpMemberDecorate %S1 3 Offset 24
-               OpMemberDecorate %S2 3 Offset 12
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.spvasm
index cb24052..1ba52ac 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.spvasm
@@ -27,10 +27,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S_atomic 0 Offset 0
-               OpDecorate %_arr_uint_uint_10 ArrayStride 4
-               OpMemberDecorate %S_atomic 1 Offset 4
-               OpMemberDecorate %S_atomic 2 Offset 44
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.spvasm
index 93a5b1a..49a70af 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.spvasm
@@ -16,10 +16,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_10 ArrayStride 4
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 44
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.spvasm b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.spvasm
index 47698cf..b119eaf 100644
--- a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.spvasm
@@ -21,9 +21,6 @@
                OpName %compute_main_inner_0 "compute_main_inner"
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S_atomic 0 Offset 0
-               OpMemberDecorate %S_atomic 1 Offset 4
-               OpMemberDecorate %S_atomic 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
diff --git a/test/tint/builtins/atomicStore/struct/via_ptr_let.wgsl.expected.spvasm b/test/tint/builtins/atomicStore/struct/via_ptr_let.wgsl.expected.spvasm
index 83a813a..bb19879 100644
--- a/test/tint/builtins/atomicStore/struct/via_ptr_let.wgsl.expected.spvasm
+++ b/test/tint/builtins/atomicStore/struct/via_ptr_let.wgsl.expected.spvasm
@@ -18,9 +18,6 @@
                OpName %wg "p0"
                OpName %p1 "p1"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
index e9eecc5..40efbcc 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
@@ -32,10 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %SB_RW_atomic = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
@@ -111,10 +107,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %SB_RW_atomic = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
index 5cd42d2..f6859e1 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
@@ -32,10 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %SB_RW_atomic = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
@@ -109,10 +105,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %SB_RW_atomic = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
index b6ecc87..4ec90d4 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
@@ -28,10 +28,6 @@
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
           %4 = OpConstantNull %uint
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
index 2a891e1..5677072 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
@@ -28,10 +28,6 @@
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
           %4 = OpConstantNull %uint
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
index f31a27a..fda66a4 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.spvasm
@@ -36,10 +36,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %SB_RW_atomic = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
@@ -129,10 +125,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %SB_RW_atomic = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
index 8c95d6c..4bbe2b1 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.spvasm
@@ -36,10 +36,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %SB_RW_atomic = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
@@ -126,10 +122,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %SB_RW_atomic = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW_atomic
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
index 9a5d55d..553032d 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.spvasm
@@ -32,10 +32,6 @@
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resulti32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
           %4 = OpConstantNull %uint
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
index 33d3ca1..947ea98 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.spvasm
@@ -32,10 +32,6 @@
                OpName %local_invocation_index_1_param "local_invocation_index_1_param"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 0 Offset 0
-               OpMemberDecorate %x__atomic_compare_exchange_resultu32 1 Offset 4
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
           %4 = OpConstantNull %uint
diff --git a/test/tint/builtins/frexp.wgsl.expected.spvasm b/test/tint/builtins/frexp.wgsl.expected.spvasm
index d9da8b3..5acd219 100644
--- a/test/tint/builtins/frexp.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %res "res"
                OpName %exp "exp"
                OpName %fract "fract"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/scalar/const.wgsl.expected.spvasm b/test/tint/builtins/frexp/scalar/const.wgsl.expected.spvasm
index 2e9a88f..1347e4e 100644
--- a/test/tint/builtins/frexp/scalar/const.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/scalar/const.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.spvasm b/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.spvasm
index 3b6f9a8..56620c3 100644
--- a/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.spvasm b/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.spvasm
index 5417c81..017e2ce 100644
--- a/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/vector/const.wgsl.expected.spvasm b/test/tint/builtins/frexp/vector/const.wgsl.expected.spvasm
index 46050b3..8100749 100644
--- a/test/tint/builtins/frexp/vector/const.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/vector/const.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/vector/mixed.wgsl.expected.spvasm b/test/tint/builtins/frexp/vector/mixed.wgsl.expected.spvasm
index ffbe67a..f41d48b 100644
--- a/test/tint/builtins/frexp/vector/mixed.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/vector/mixed.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/frexp/vector/runtime.wgsl.expected.spvasm b/test/tint/builtins/frexp/vector/runtime.wgsl.expected.spvasm
index 88c80e9..e9f54e7 100644
--- a/test/tint/builtins/frexp/vector/runtime.wgsl.expected.spvasm
+++ b/test/tint/builtins/frexp/vector/runtime.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %exp "exp"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm
index afeba16..2f6c101 100644
--- a/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm
index 2c460f7..d03371f 100644
--- a/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm
index af76491..997d606 100644
--- a/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm
index 19c3248..3cc057f 100644
--- a/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.spvasm
index 8bd6953..6f01263 100644
--- a/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.spvasm
index 6388b4c..fd8e82c 100644
--- a/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm
index c49712f..3e551c6 100644
--- a/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm
index 8069d7d..0857514 100644
--- a/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.spvasm
index 8f4d816..c041e9d 100644
--- a/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.spvasm
index 0d13ca0..f4294eb 100644
--- a/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.spvasm
index fc2575e..64cef36 100644
--- a/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm
index 8ae0c6a..33360aa 100644
--- a/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.spvasm
index 3d47678..0ebb3ec 100644
--- a/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm
index 96b1fe1..7d23037 100644
--- a/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm
index d01955d..9fc2123 100644
--- a/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm
index 3fd6c0b..df0821f 100644
--- a/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.spvasm
index 867018e..08a9d6d 100644
--- a/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.spvasm
index 73eea57..c2584fc 100644
--- a/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm
index 6686c10..177ecae 100644
--- a/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.spvasm
index 74294b8..3029953 100644
--- a/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm
index fc17e08..d85cec7 100644
--- a/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.spvasm
index 87cf68c..ca1937b 100644
--- a/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.spvasm
index 42648a1..120e9d2 100644
--- a/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.spvasm
index 8901253..bb94f65 100644
--- a/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.spvasm
index c809713..c77db53 100644
--- a/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.spvasm
index 6cc5104..8a03f72 100644
--- a/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.spvasm
index 407fe44..ef5d904 100644
--- a/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.spvasm
index 0ebdf54..06b3b9f 100644
--- a/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.spvasm
index eca3890..701c50d 100644
--- a/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm
index 5337470..eac81c4 100644
--- a/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.spvasm
index 2c5c853..184c48d 100644
--- a/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.spvasm
index 075451d..128399a 100644
--- a/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm
index 58b6e8d..9caf482 100644
--- a/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm
index 967b34e..bfb6735 100644
--- a/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm
index 6e18159..7951199 100644
--- a/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.spvasm
index 93a632d..58412b7 100644
--- a/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.spvasm
index 7b06c69..7c51ecb 100644
--- a/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.spvasm
index 00e4d17..f7ce475 100644
--- a/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.spvasm
index 847475f..e666e16 100644
--- a/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.spvasm
index 0bc3bb8..8d2855f 100644
--- a/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.spvasm
index 4a3b4a7..bf1e71e 100644
--- a/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.spvasm
index 4d13047..84971dc 100644
--- a/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.spvasm
index c41e265..b1c743d 100644
--- a/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.spvasm
index 50e492f..d38f19d 100644
--- a/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.spvasm
index fc359e3..b3697d5 100644
--- a/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.spvasm
index f5e6a02..1f113f5 100644
--- a/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.spvasm
index 1b34e87..82c6612 100644
--- a/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.spvasm
index 7212e42..d0c5c11 100644
--- a/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm
index 36f954d..b83d7c5 100644
--- a/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm
index 7665767..551986e 100644
--- a/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm
index 8a90aa5..36f0c25 100644
--- a/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm
index 46216d5..7b35cdd 100644
--- a/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm
index 56c6898..c89a5db 100644
--- a/test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm
index 64abfe9..de2c272 100644
--- a/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm
index dbc49a8..51899f2 100644
--- a/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm
index 0a6a508..59d3d93 100644
--- a/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/arrayLength/1cf529.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/1cf529.wgsl.expected.spvasm
index 3ae0569..0c79732 100644
--- a/test/tint/builtins/gen/literal/arrayLength/1cf529.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/1cf529.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
       %SB_RO = OpTypeStruct %_runtimearr_uint
diff --git a/test/tint/builtins/gen/literal/arrayLength/3a93e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/3a93e6.wgsl.expected.spvasm
index 0af292a..fbd2fe0 100644
--- a/test/tint/builtins/gen/literal/arrayLength/3a93e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/3a93e6.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
 %_runtimearr_float = OpTypeRuntimeArray %float
       %SB_RO = OpTypeStruct %_runtimearr_float
diff --git a/test/tint/builtins/gen/literal/arrayLength/9ea96d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/9ea96d.wgsl.expected.spvasm
index 4e4c73b..f05e233 100644
--- a/test/tint/builtins/gen/literal/arrayLength/9ea96d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/9ea96d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %half = OpTypeFloat 16
 %_runtimearr_half = OpTypeRuntimeArray %half
       %SB_RO = OpTypeStruct %_runtimearr_half
diff --git a/test/tint/builtins/gen/literal/arrayLength/bf7d97.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/bf7d97.wgsl.expected.spvasm
index 2c79b63..22f3d17 100644
--- a/test/tint/builtins/gen/literal/arrayLength/bf7d97.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/bf7d97.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
 %_runtimearr_int = OpTypeRuntimeArray %int
       %SB_RO = OpTypeStruct %_runtimearr_int
diff --git a/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm
index e382d17..098c731 100644
--- a/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.spvasm
index 1cabf75..b2f97eb 100644
--- a/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.spvasm
index d457545..488391d 100644
--- a/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.spvasm
index 6ec4445..a15e0a5 100644
--- a/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.spvasm
index a9c5aa1..a48b5b3 100644
--- a/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.spvasm
index 618ed7a..e27f0f6 100644
--- a/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm
index aebf421..93fe784 100644
--- a/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm
index f5bf0bb..a720549 100644
--- a/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.spvasm
index 090afe3..1a4f730 100644
--- a/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.spvasm
index 054cbe8..ea9de67 100644
--- a/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.spvasm
index 3ed49f6..c434ecc 100644
--- a/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm
index aa98255..18ac21c 100644
--- a/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.spvasm
index 96b4eeb..7f5c81b 100644
--- a/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.spvasm
index 7d3a164..0745710 100644
--- a/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.spvasm
index ad88a12..5fddb23 100644
--- a/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.spvasm
index cbbc2ec..c362590 100644
--- a/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.spvasm
index d1df5f3..4cd5b21 100644
--- a/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.spvasm
index 7b8d8a0..cd812ce 100644
--- a/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.spvasm
index 6d09728..aa08cb6 100644
--- a/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.spvasm
index db49edd..9fe771b 100644
--- a/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.spvasm
index b0c85d6..488c603 100644
--- a/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.spvasm
index c5f0102..4a99783 100644
--- a/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.spvasm
index 0f1d0dc..38f62bc 100644
--- a/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.spvasm
index 9db6a16..b95472a 100644
--- a/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm
index 083ffec..909aa65 100644
--- a/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.spvasm
index 01ab572..31784d8 100644
--- a/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.spvasm
index dff9d13..5cd5329 100644
--- a/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm
index 9fa3828..4f31cad 100644
--- a/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.spvasm
index da015d3..29057c1 100644
--- a/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.spvasm
index 07b5d9c..ba3ada8 100644
--- a/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.spvasm
index dc8b7ff..b9ac4c1 100644
--- a/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.spvasm
index 0e8c4f4..920570c 100644
--- a/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.spvasm
index 416be28..4893166 100644
--- a/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm
index 215b1ca..c348d94 100644
--- a/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm
index 04cea28..448589b 100644
--- a/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.spvasm
index 8e55b59..0ae0b4e 100644
--- a/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.spvasm
index 6ed0cfd..c9d7ff0 100644
--- a/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.spvasm
index 6b759ec..b1f540e 100644
--- a/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.spvasm
index 75e1452..4ef3044 100644
--- a/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm
index 30a5a60..121d35f 100644
--- a/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.spvasm
index a149ba4..1ccfd61 100644
--- a/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm
index d23c547..3181dff 100644
--- a/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm
index 562f180..08cc3d2 100644
--- a/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm
index 7fd0275..84863fb 100644
--- a/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.spvasm
index f27186d..c8bba62 100644
--- a/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.spvasm
index 8341d24..630c26b 100644
--- a/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.spvasm
index 9f7195a..79641c0 100644
--- a/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.spvasm
index ebeea19..f354603 100644
--- a/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.spvasm
index 647b581..592e047 100644
--- a/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.spvasm
index 1acdfed..1685476 100644
--- a/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.spvasm
index 59d5bfe..aac0834 100644
--- a/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.spvasm
index 47a7c27..2ee8c45 100644
--- a/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.spvasm
index 97f3c27..3197766 100644
--- a/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.spvasm
index c67ab65..95a1f25 100644
--- a/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.spvasm
index efb21cc..604fad6 100644
--- a/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.spvasm
index cc01555..c6524d5 100644
--- a/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.spvasm
index 408df0f..1c53ec3 100644
--- a/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.spvasm
index c58b7d9..1a71dfa 100644
--- a/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.spvasm
index f6842da..acfaadb 100644
--- a/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.spvasm
index 3d7f5ec..8b55c71 100644
--- a/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
index 5ccba3e..b2fd9fe 100644
--- a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
@@ -26,8 +26,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
       %SB_RW = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW
@@ -86,8 +84,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
       %SB_RW = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW
diff --git a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
index 3235b6b..ec17dda 100644
--- a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
@@ -26,8 +26,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
       %SB_RW = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW
@@ -84,8 +82,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
       %SB_RW = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW
diff --git a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
index 582a1ce..3e79a6d 100644
--- a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Workgroup_uint = OpTypePointer Workgroup %uint
       %arg_0 = OpVariable %_ptr_Workgroup_uint Workgroup
diff --git a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
index ce7b8de..e41b546 100644
--- a/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %_ptr_Workgroup_int = OpTypePointer Workgroup %int
       %arg_0 = OpVariable %_ptr_Workgroup_int Workgroup
diff --git a/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.spvasm
index 27664eb..0819522 100644
--- a/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.spvasm
index c990bed..fc9cac6 100644
--- a/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.spvasm
index 00ed42a..0db07cf 100644
--- a/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.spvasm
index acff683..1a034ab 100644
--- a/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.spvasm
index cd82e1e..bc00b30 100644
--- a/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.spvasm
index ffe8fe3..053fc16 100644
--- a/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.spvasm
index 378508b..52fdf14 100644
--- a/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.spvasm
index ed29fe8..1475253 100644
--- a/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.spvasm
index 0d2c23d..ab28a0e 100644
--- a/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.spvasm
index 70f9466..ea5c0c1 100644
--- a/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.spvasm
index 44a59db..1400ff7 100644
--- a/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.spvasm
index 82e6727..eca7f00 100644
--- a/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.spvasm
index 8328dbe..007003a 100644
--- a/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.spvasm
index ccb0545..774d967 100644
--- a/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.spvasm
index 3fefbc9..78b335c 100644
--- a/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.spvasm
index fbd9b97..6e983bb 100644
--- a/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.spvasm
index b5a803a..fbede69 100644
--- a/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.spvasm
index fbb4dee..4dc1255 100644
--- a/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.spvasm
index ec52876..0e1b477 100644
--- a/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.spvasm
index f0ffe4d..cad8895 100644
--- a/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.spvasm
index 130bb6c..1ede7ad 100644
--- a/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.spvasm
index 2ac58b7..ab3c9ec 100644
--- a/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.spvasm
index a1a5270..22f585d 100644
--- a/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.spvasm
index 6230dca..7c364d4 100644
--- a/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.spvasm
index 14b6a75..424bf01 100644
--- a/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.spvasm
index bf28b69..c6ad75e 100644
--- a/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.spvasm
index 1503a19..9600291 100644
--- a/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.spvasm
index 9584443..704472d 100644
--- a/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.spvasm
index 11c3712..59a98c4 100644
--- a/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.spvasm
index 81cc130..d644005 100644
--- a/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.spvasm
index d10623f..9dcfe8d 100644
--- a/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.spvasm
index 6d90fa4..6b6b05f 100644
--- a/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.spvasm
index 6aef401..3b000d6 100644
--- a/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.spvasm
index 160b150..f1c0a6c 100644
--- a/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.spvasm
index 2f9b845..caeb276 100644
--- a/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.spvasm
index 91c1155..562ab4a 100644
--- a/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.spvasm
index e2cf346..a9837df 100644
--- a/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.spvasm
index ebb2a94..a30c5d3 100644
--- a/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.spvasm
index 26b894b..7241357 100644
--- a/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.spvasm
index 38e1528..41a5595 100644
--- a/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.spvasm
index 9c474f4..8ea8f85 100644
--- a/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.spvasm
index ed82379..2b9b2d2 100644
--- a/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.spvasm
index 3a1ae13..6e83d75 100644
--- a/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.spvasm
index d92edc6..ba6ef85 100644
--- a/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.spvasm
index 164ddd9..f2c4a12 100644
--- a/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.spvasm
index 3dcc0bb..ca40e04 100644
--- a/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.spvasm
index 3547669..3b7578af 100644
--- a/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.spvasm
index 2a88222..0db22b7 100644
--- a/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.spvasm
index d2fbb63..c6272ec 100644
--- a/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.spvasm
index 8d014e2..e3698e5 100644
--- a/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.spvasm
index 421aca5..6ff1562 100644
--- a/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.spvasm
index a2ace85..ddcfb0c 100644
--- a/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.spvasm
index 8763b5b..10c7ffa 100644
--- a/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.spvasm
index e9af856..2ccf36e 100644
--- a/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.spvasm
index e4f2efb..fc5c6fa 100644
--- a/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.spvasm
index 0fc000d..7dfdf68 100644
--- a/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.spvasm
index 6b38c25..517b424 100644
--- a/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.spvasm
index d8850cc..7035d33 100644
--- a/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.spvasm
index 12f98b0..88ee9cc 100644
--- a/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.spvasm
index c08694e..28d5be1 100644
--- a/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm
index 70e099e..01bf598 100644
--- a/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.spvasm
index 8938010..c02904d 100644
--- a/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm
index 88034dd..3a13ffe 100644
--- a/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm
index e9fc528..0035bdb 100644
--- a/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm
index bed768f..fe3372c 100644
--- a/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.spvasm
index a2bcf4a..ef637ca 100644
--- a/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.spvasm
index d0a323f..76d70c6 100644
--- a/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.spvasm
index 72982d6..1d5e3192 100644
--- a/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm
index 7df25a0..7f60c98 100644
--- a/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.spvasm
index 8631d6c..b17da68 100644
--- a/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm
index 1f2b324..9cbd35d 100644
--- a/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.spvasm
index 68835c8..3661790 100644
--- a/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.spvasm
index e114efe..a6493fd 100644
--- a/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm
index 8a721a7..babad65 100644
--- a/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm
index 3e26a7f..28ea574 100644
--- a/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.spvasm
index 1e57e6d..730b325 100644
--- a/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm
index be786ec..d81b03c 100644
--- a/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.spvasm
index 2b1a167..9355834 100644
--- a/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.spvasm
index 7bf7b3b..d4747fd 100644
--- a/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm
index b4ee543..bf348ad 100644
--- a/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm
index 4c42838..5f7d1a1 100644
--- a/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm
index a6d8b7c..5c25b31 100644
--- a/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm
index 44f9aed..e5d9f12 100644
--- a/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.spvasm
index 531a276..07d8566 100644
--- a/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.spvasm
index bd72fe6..1cdb25b 100644
--- a/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.spvasm
index 0e373a3..5b6a186 100644
--- a/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.spvasm
index 2974a88..1d78b6b 100644
--- a/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm
index 4b579b5..eee313c 100644
--- a/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm
index de2b65b..16c0520 100644
--- a/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.spvasm
index e5ca55d..60cf00d 100644
--- a/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm
index caea29e..d87a053 100644
--- a/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.spvasm
index 922e485..3155024 100644
--- a/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.spvasm
index cd46307..cf922bc 100644
--- a/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.spvasm
index fabf1dd..1d7296a 100644
--- a/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm
index cb8cc9b..55fbc8c 100644
--- a/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm
index d84299d..c888bb8 100644
--- a/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.spvasm
index 0b849e6..41dd30e 100644
--- a/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.spvasm
index 6073c08..e002ecd 100644
--- a/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.spvasm
index 7316925..d2ff8a5 100644
--- a/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.spvasm
index 5025495..201eaf2 100644
--- a/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.spvasm
index d566113..2e0c1af 100644
--- a/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm
index e0f0140..8b43d6d 100644
--- a/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm
index ef22357..2ae39ea 100644
--- a/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.spvasm
index c491660..e812ec1 100644
--- a/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.spvasm
index 1137c73..a8a7ca3 100644
--- a/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm
index b26b6aa..8b53afe 100644
--- a/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.spvasm
index 71f5376..b7cf5db 100644
--- a/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.spvasm
index a367b59..b5cb5ee 100644
--- a/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.spvasm
index b2b09f8..b0a0ae5 100644
--- a/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.spvasm
index 69df26f..fc2256a 100644
--- a/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm
index 43259ec..f20d1d4 100644
--- a/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.spvasm
index 22e5eb5..1e4a416 100644
--- a/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.spvasm
index ff62b5e..474d061 100644
--- a/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm
index abf0040..62fcf20 100644
--- a/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm
index 713f356f..908d0f7 100644
--- a/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.spvasm
index b17be94..327b8aa 100644
--- a/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm
index 276961a..711e173 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm
index b39630a..b775e5a 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm
index 6d77340..3be3d83 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm
index e7907c2..09e04b9 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm
index cc2ff88..e4e39bb 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm
index e07d3e7..b59f2e4 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm
index 6fffb25..46ada64 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm
index 626ceb8..3a21e44 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm
index 3484273..498284f 100644
--- a/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm
index 8bf9142..f9460b2 100644
--- a/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm
index 1f5401e..3634740 100644
--- a/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm
index ac0f02b..97de411 100644
--- a/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm
index 3b101f5..e1265dc 100644
--- a/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm
index e9241f6..999550e 100644
--- a/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm
index c559e42..65ab9de 100644
--- a/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm
index 741be01..51afefa 100644
--- a/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm
index c2b4d071..ef3a8ef 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm
index fafc68d..53bcbce 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm
index 926eef0..04206dc 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm
@@ -116,8 +116,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm
index bfcbd37..52f7e62 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm
index 58fe009..a4fa66f 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm
index fd91939..310a06c 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm
index 873e637..536b9c5 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
index b147f90..41938c3 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm
index eb79f6c..4bc86ae 100644
--- a/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.spvasm
index 0f1346b..db9c258 100644
--- a/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.spvasm
index bd9aaf5..04020a7 100644
--- a/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm
index 894080e..ad55989 100644
--- a/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm
index 84a2747..1458798 100644
--- a/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm
index 5db391b..91e3f2a 100644
--- a/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.spvasm
index f7394ee..15d0809 100644
--- a/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm
index 0657ebe..3064577 100644
--- a/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.spvasm
index 3c50b01..cfb7e84 100644
--- a/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.spvasm
index 1f0aea4..44fc7a9 100644
--- a/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.spvasm
index a16a5d5..f0e0abf 100644
--- a/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.spvasm
index 17bf483..18ad037 100644
--- a/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.spvasm
index 8db4a66..b82e0fc 100644
--- a/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.spvasm
index 464b8ac..0634508 100644
--- a/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.spvasm
index e39505f..92e9e16 100644
--- a/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.spvasm
index 8755495..a0497da 100644
--- a/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm
index b64acf8..dec66951 100644
--- a/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.spvasm
index aaab3b8..b8cae01 100644
--- a/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm
index 267516f..bfd16fa 100644
--- a/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.spvasm
index 9496196..fa2c542 100644
--- a/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.spvasm
index 4a660a3..8417296 100644
--- a/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.spvasm
index c96b4b2..1652f30 100644
--- a/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm
index c4d6085..931c26c 100644
--- a/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.spvasm
index 24462fa..71e0e18 100644
--- a/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm
index 7ec8120..5cd5985 100644
--- a/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.spvasm
index 4e6efe4..4631223 100644
--- a/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.spvasm
index f0bd173..7c90b811 100644
--- a/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.spvasm
index 36078af..83b1cef 100644
--- a/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.spvasm
index da7911e..c255074 100644
--- a/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.spvasm
index 7c99853..d7aee14 100644
--- a/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.spvasm
index 3f36171..ad03d64 100644
--- a/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm
index c6aa896..dc42794 100644
--- a/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm
index 998ce82..1a4e1e0 100644
--- a/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.spvasm
index 75f34d5..8811438 100644
--- a/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm
index 012b4dd..611f409 100644
--- a/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.spvasm
index b8874c5..472d9c8 100644
--- a/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.spvasm
index 7119a33..6e5cbc0 100644
--- a/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm
index c945099..95a63b4 100644
--- a/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.spvasm
index 368d866..1e7ee97 100644
--- a/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.spvasm
index 5c7b5c9..2156181 100644
--- a/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.spvasm
index a442154..fa7eb4d 100644
--- a/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm
index 4ac7176..787f98d 100644
--- a/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm
index 4f4ecce..1fb957a 100644
--- a/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.spvasm
index 4539700..0442267 100644
--- a/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm
index 2a97e38..d3a0661 100644
--- a/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm
index 23654f2d..43ffb08 100644
--- a/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.spvasm
index b8e5414..8327d71 100644
--- a/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.spvasm
index 9c2f223..019c6a3 100644
--- a/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.spvasm
index da0b8a3..b3f50b2 100644
--- a/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm
index a73dc00..67db034 100644
--- a/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.spvasm
index 36ab967..46c4c06 100644
--- a/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm
index 47c1058..0994df8 100644
--- a/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm
index e1eedd6..0f9316a 100644
--- a/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm
index 5c7c967..c770d1e 100644
--- a/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.spvasm
index 3e30b17..898b8b3 100644
--- a/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.spvasm
index 39ba1a1..4bffef4 100644
--- a/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm
index 8f00421..a63b826 100644
--- a/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.spvasm
index f6a182e..8587ce7 100644
--- a/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm
index 68ea7de..701bef9 100644
--- a/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.spvasm
index c62f036..d44b017 100644
--- a/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.spvasm
index d68d21b..34bd00e 100644
--- a/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.spvasm
index 30b6250..bfd7bd7 100644
--- a/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.spvasm
index 4cdae34..4c0ca29 100644
--- a/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm
index f86502d..c911a58 100644
--- a/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.spvasm
index 37a9a43..879d16c 100644
--- a/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.spvasm
index 357df36..c11887b 100644
--- a/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm
index 4c3da6b..5477429 100644
--- a/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.spvasm
index d273a81..ab54873 100644
--- a/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.spvasm
index 492ddc8..46071ac 100644
--- a/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.spvasm
index 06296b4..18a07fc 100644
--- a/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm
index a15d02a..72b7b37 100644
--- a/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.spvasm
index 26750ff..32dddca 100644
--- a/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.spvasm
index 3149b24..a207f76 100644
--- a/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.spvasm
index b40bcd9..f3e741f 100644
--- a/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm
index b5a3eaa..76e46a9 100644
--- a/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.spvasm
index c9644b7..d831182 100644
--- a/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm
index 0fea757..8113acf 100644
--- a/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm
index 0c6570b..01011bc 100644
--- a/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.spvasm
index 2aa8614..c341f62 100644
--- a/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.spvasm
index 5d80ef2..f1d3d20 100644
--- a/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm
index f644bb5..2ab7bd9 100644
--- a/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm
index 1b465b7..ebe32f69 100644
--- a/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm
index 9872447..3e776a8 100644
--- a/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm
index 7a03b94..900e3a0 100644
--- a/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm
index 194d337..d03ae91 100644
--- a/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm
@@ -116,8 +116,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm
index b00add8..b460439 100644
--- a/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm
index 05f5f96..380bb7a 100644
--- a/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm
index 38b7457..1ea6523 100644
--- a/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.spvasm
index bc94d4d..5c566fa 100644
--- a/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.spvasm
index d5ce6c0..260eacf 100644
--- a/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm
index b4593e4..a387c29 100644
--- a/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm
index 4e23a58..d68d033 100644
--- a/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.spvasm
index e237bb6..a43a964 100644
--- a/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.spvasm
index 35811630..5ab29d8 100644
--- a/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm
index 09b5b2a..b35ddc2 100644
--- a/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.spvasm
index 8e8d395..ef6efa4 100644
--- a/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.spvasm
index bc3a609..5dd6987 100644
--- a/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm
index af8b95e..9dc6469 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm
index a43bd3b..7f3db20 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
index f8ba8be..a52425e 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm
index 54c1118..48c70e5 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm
index 0339c95..9a4797d 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm
index 8a7dbf9..7721f398 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm
index 2f5f229..273d3e2 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm
index d673761..c6952d8 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm
@@ -116,8 +116,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm
index e1ecdcf..e9d8f4a 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm
index 631dd56..e347577 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm
index 18914ca..5a067a3 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm
index ba3d5a7..37c1164 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm
@@ -116,8 +116,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm
index e12832a..14bb93b 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm
index 56bb735..b847718 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm
index 1ef921a..14043c3 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm
index e3c259d..8674d96 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.spvasm
index 212d0e3..bf77c4d 100644
--- a/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.spvasm
index 6cd71fa..061a74c 100644
--- a/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm
index d6f2e3c..4464786 100644
--- a/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm
index e332934..6d14bd3 100644
--- a/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm
index c4a299d..acaf189 100644
--- a/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm
index d8ae20d..93b21d8 100644
--- a/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.spvasm
index 1939834..44eb628 100644
--- a/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.spvasm
index 89cf86f..e74cebe 100644
--- a/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.spvasm
index 5945211..f437326 100644
--- a/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.spvasm
index 9813619..26a67a0 100644
--- a/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.spvasm
index 614b10c..e5dd8a0 100644
--- a/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.spvasm
index d6a32c8..1dd18b1 100644
--- a/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.spvasm
index cdcf2b1..68a4932 100644
--- a/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.spvasm
index e1109e7..589f18f 100644
--- a/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm
index d73a072..7e3a7d1 100644
--- a/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.spvasm
index b0cb9f9..ba718b7 100644
--- a/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm
index 4e0fdb9..9716d75 100644
--- a/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.spvasm
index 361454e..463a280 100644
--- a/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.spvasm
index e4bdab4..17c33b8 100644
--- a/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm
index 43f6564..d1917d3 100644
--- a/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.spvasm
index c6a8395..6250d96 100644
--- a/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm
index e340d69..0fd9d6c 100644
--- a/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.spvasm
index 40a304d..f404bf4 100644
--- a/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.spvasm
index a38e7a1..59d2821 100644
--- a/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.spvasm
index 3ac7b74..04b30c6 100644
--- a/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.spvasm
index 03dba36..9305b00 100644
--- a/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.spvasm
index 2c7d1e3..08cfe73 100644
--- a/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.spvasm
index 0f8cfb5..3079f75 100644
--- a/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm
index 5969579..166e894 100644
--- a/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm
index 2a13497..189bf87 100644
--- a/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.spvasm
index 03ecc08..aa9b1e7 100644
--- a/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm
index faf2ec3..823db65 100644
--- a/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.spvasm
index d66b214..dab6944 100644
--- a/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.spvasm
index 5c98b34..a23dbc5 100644
--- a/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.spvasm
index 9ea7493..5d61602 100644
--- a/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm
index e37b734..12fd304 100644
--- a/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.spvasm
index 4f203fa..39f82e2 100644
--- a/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.spvasm
index 72330ce..6d624ae 100644
--- a/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__frexp_result_vec4_f16 "__frexp_result_vec4_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec4_f16 "__frexp_result_vec4_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -120,9 +116,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
index 1f4f43d..4458269 100644
--- a/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -56,8 +54,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -103,9 +99,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.spvasm
index 68bcc49..6f86681 100644
--- a/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__frexp_result_f16 "__frexp_result_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -62,8 +60,6 @@
                OpName %__frexp_result_f16 "__frexp_result_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -112,9 +108,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.spvasm
index 700f4d1..f677e81 100644
--- a/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__frexp_result_vec2_f16 "__frexp_result_vec2_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec2_f16 "__frexp_result_vec2_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -120,9 +116,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.spvasm
index 3f0bbab..d9d3250 100644
--- a/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
index c0e0604..b06d26a 100644
--- a/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
index 82bd1c2..dcf83fc 100644
--- a/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.spvasm
index f53c6f5..e67dd24 100644
--- a/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__frexp_result_vec3_f16 "__frexp_result_vec3_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec3_f16 "__frexp_result_vec3_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -120,9 +116,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.spvasm
index 10b50b0..4b7b71a 100644
--- a/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -56,8 +54,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -103,9 +99,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.spvasm
index 97531fd..800b1cf 100644
--- a/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
index f4c0198..dc62ef3 100644
--- a/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm
index a8dfb40..99d7051 100644
--- a/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm
index 5231542..4fc541e 100644
--- a/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm
index ee1a986..e1d21bb 100644
--- a/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm
index 7cf751f..fd8e751 100644
--- a/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm
index 2533e9f..7d17df5 100644
--- a/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm
index 5f2d18d..f983429 100644
--- a/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm
index 33e019e..33e4346 100644
--- a/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm
index 83e776d..86b0ac7 100644
--- a/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.spvasm
index f53d2bc..92ebdf3 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.spvasm
index f0f59ee..3b28760 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.spvasm
index d3d3bf4..4d120a8 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.spvasm
index 57e6fd5..725dc7b 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.spvasm
index 13c1e9f..fabba32 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm
index 2ee2aa4..5fbf3e9 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm
index 3a56cec..df25f90 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm
index 207fb94..128d514 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.spvasm
index f8f817e..24fdaa4 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm
index 020d228..6203402 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.spvasm
index 5116b47..8375903 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.spvasm
index be8aea8..0468060 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.spvasm
index 6383778..d4280b0 100644
--- a/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.spvasm
index c7c228c..80161bd 100644
--- a/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.spvasm
index 6901c17..6561f7c 100644
--- a/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.spvasm
index d61399c..248c129 100644
--- a/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.spvasm
index b68b3c5..76e870a 100644
--- a/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.spvasm
index 174c889..8b883c7 100644
--- a/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.spvasm
index 4e310a5..fd6f270 100644
--- a/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.spvasm
index 23ca066..6e81c19 100644
--- a/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.spvasm
index 955ecd5..6a9e60e 100644
--- a/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.spvasm
index b2bad9a..570dcbb 100644
--- a/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.spvasm
index d631bc5..7fcd35a 100644
--- a/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.spvasm
index b756458..5c7f3d7 100644
--- a/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.spvasm
index e8e4e78..e9def96 100644
--- a/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.spvasm
index 59a6f76..fe1156f 100644
--- a/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.spvasm
index 8df8d45..e9f6d02 100644
--- a/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.spvasm
index 39405b1..90fc010 100644
--- a/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm
index 8c50a1e..0642793 100644
--- a/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.spvasm
index 3a5c6b7..d0c1aa9 100644
--- a/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm
index fedec98..a47590e 100644
--- a/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.spvasm
index c7cae7e..51242a6 100644
--- a/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.spvasm
index cbfacbc..a4644c8 100644
--- a/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm
index 3728996..5d5e200 100644
--- a/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm
index 3420aab..0ffe126 100644
--- a/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.spvasm
index d7ee3d6d..f496507 100644
--- a/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm
index 9229e33..d7612d3 100644
--- a/test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.spvasm
index 8974182..492819d 100644
--- a/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.spvasm
index 61cf375..5085328 100644
--- a/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.spvasm
index e085d78..16ab905 100644
--- a/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm
index f91b816..87ed1eb 100644
--- a/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.spvasm
index 254b0bf..5f365a6 100644
--- a/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.spvasm
index dbbb85e..6fd9c44 100644
--- a/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm
index 5de3c4a..b0d887d 100644
--- a/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.spvasm
index 56539ea..9aa6402 100644
--- a/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm
index 0357005..83e70f9 100644
--- a/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.spvasm
index 0c32a18..5db2874 100644
--- a/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.spvasm
index d40909e..e870671 100644
--- a/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm
index c19cb6b..c026e90 100644
--- a/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/655989.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/655989.wgsl.expected.spvasm
index 90b3731..25209b9 100644
--- a/test/tint/builtins/gen/literal/log/655989.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/655989.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.spvasm
index 10d85f3..7f4e406 100644
--- a/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.spvasm
index 10761b2..2b50170 100644
--- a/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm
index 5e00119..0fad596 100644
--- a/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.spvasm
index 6442df8..2b369ce 100644
--- a/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm
index 41595e8..a79fd7c 100644
--- a/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.spvasm
index e1237b9..5339064 100644
--- a/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.spvasm
index c0f855d..f2bbecf 100644
--- a/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.spvasm
index e1c9a15..e57a53d 100644
--- a/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm
index c70cc60..e290ae5 100644
--- a/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.spvasm
index 14cf298..bee07ce 100644
--- a/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.spvasm
index 8ba3f41..bd74cea 100644
--- a/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.spvasm
index 7c2ef43..e3dcf5d 100644
--- a/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm
index 52e3ff4..77f8499 100644
--- a/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.spvasm
index eddddb5..c9bd5ea 100644
--- a/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.spvasm
index 350f766..e3706fd 100644
--- a/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.spvasm
index 9987762..8248816 100644
--- a/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.spvasm
index fdf5aee..e9e32ca 100644
--- a/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm
index 6c272df..2549679 100644
--- a/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.spvasm
index 7ffd572..856bb86 100644
--- a/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm
index 5d54617..ce9dca1 100644
--- a/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm
index d9cf3c7..e75205e 100644
--- a/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.spvasm
index da568c7..2652111 100644
--- a/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.spvasm
index 9acc33f..0e5542b 100644
--- a/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm
index 7e30f52..2a173a6 100644
--- a/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.spvasm
index 34457ba..a7763e2 100644
--- a/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.spvasm
index 108027d..b4ee791 100644
--- a/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm
index 9549380..a386b9d 100644
--- a/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm
index 57ca4ef..f6f2572 100644
--- a/test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.spvasm
index e222062..5749754 100644
--- a/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/445169.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/445169.wgsl.expected.spvasm
index fcf6e49..107f8fc 100644
--- a/test/tint/builtins/gen/literal/max/445169.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/445169.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm
index 9588fe4..9e12311 100644
--- a/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm
index 65ec90b..73de0c6 100644
--- a/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm
index 4fe7ea3..4af7c58 100644
--- a/test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.spvasm
index 0665aa0..f82543e 100644
--- a/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm
index af26657..dc11b74 100644
--- a/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.spvasm
index 029b515..9fb7358 100644
--- a/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm
index 5ff0706..dab2981 100644
--- a/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.spvasm
index 37aaee3..5cd394e 100644
--- a/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm
index 5bebb74..84a05b7 100644
--- a/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm
index 75eca0f..7d5b626 100644
--- a/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.spvasm
index 20fb9dc..7e11488 100644
--- a/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.spvasm
index 955ca48..857ac70 100644
--- a/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm
index cc238e0..8768a7f 100644
--- a/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.spvasm
index ee10875..acd49a9 100644
--- a/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.spvasm
index d874569..3ae59eb 100644
--- a/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm
index 0e113e5..a84132d 100644
--- a/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm
index 34afeae..69090a9 100644
--- a/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm
index e84d165..5137591 100644
--- a/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/364910.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/364910.wgsl.expected.spvasm
index 949144e..712c1ca 100644
--- a/test/tint/builtins/gen/literal/min/364910.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/364910.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.spvasm
index 033a881..f0aecf6 100644
--- a/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm
index f21b783..04ce45f 100644
--- a/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm
index d1ef822..e5a6adb 100644
--- a/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.spvasm
index 7a007b5..8066a06 100644
--- a/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/717257.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/717257.wgsl.expected.spvasm
index e906e50..64fcdda 100644
--- a/test/tint/builtins/gen/literal/min/717257.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/717257.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/794711.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/794711.wgsl.expected.spvasm
index 1c44275..78e91ec 100644
--- a/test/tint/builtins/gen/literal/min/794711.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/794711.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.spvasm
index a282769..865728d 100644
--- a/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm
index c8b4287..0fea381 100644
--- a/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.spvasm
index e9c9809..3eee456 100644
--- a/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm
index 34f4f29..aaa47a1 100644
--- a/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.spvasm
index 3b892f3..41f1291 100644
--- a/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm
index 012dc53..7111531 100644
--- a/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm
index b39e78d..bf7ee38 100644
--- a/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.spvasm
index cc9b60f..616573d 100644
--- a/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.spvasm
index 153f10e..1061c45 100644
--- a/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm
index d90e080..4cfdc7b 100644
--- a/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.spvasm
index 53cd8be..7c25bf9 100644
--- a/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm
index a978255..405acd0 100644
--- a/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm
index 5879173..6c0bba0 100644
--- a/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm
index 4cf8a4d..ab9d97e 100644
--- a/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.spvasm
index ab79ba0..78a1b48 100644
--- a/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm
index d5621f6..762ab50 100644
--- a/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm
index 115dede..80d4039 100644
--- a/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.spvasm
index 08815a0..7c41846 100644
--- a/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm
index addc9c6..550c4ac 100644
--- a/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.spvasm
index aea3d25..79f67a5 100644
--- a/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm
index 148bb48..306f4a8 100644
--- a/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.spvasm
index e1aa51c..5597eda 100644
--- a/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.spvasm
index 6b76936..f6d1fcb 100644
--- a/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.spvasm
index 7718fb8..e0a2218 100644
--- a/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm
index 8601850..82879f2 100644
--- a/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.spvasm
index 9d99aec..cff2a33 100644
--- a/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm
index 5ee68b1..246ad67 100644
--- a/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.spvasm
index fbcbbbd..18b37c7 100644
--- a/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.spvasm
index 8288916..d85b042 100644
--- a/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.spvasm
index 53126bf..2f548e5 100644
--- a/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.spvasm
index cd3db93..2b297b7 100644
--- a/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm
index 846f0e7..073d327 100644
--- a/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.spvasm
index 320bf16..0413220 100644
--- a/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.spvasm
index 389f415..10e93b0 100644
--- a/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.spvasm
index d70259b..9c5d8fa 100644
--- a/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.spvasm
index 4254af5..eea5c5c 100644
--- a/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
index 1bc3c1b..8183397 100644
--- a/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.spvasm
index ee7fce1..aee2580 100644
--- a/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__modf_result_vec3_f16 "__modf_result_vec3_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec3_f16 "__modf_result_vec3_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -116,9 +112,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
index 320aeb9..0de831f 100644
--- a/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
index 5f4e95b..1cf1c03 100644
--- a/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.spvasm
index 5601013..c37d079 100644
--- a/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.spvasm
index d1f2ff7..c2c12c0 100644
--- a/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.spvasm
index ff739a83..247fe47 100644
--- a/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__modf_result_f16 "__modf_result_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -61,8 +59,6 @@
                OpName %__modf_result_f16 "__modf_result_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -110,9 +106,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.spvasm
index 61bb277..d089279 100644
--- a/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__modf_result_vec4_f16 "__modf_result_vec4_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec4_f16 "__modf_result_vec4_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -116,9 +112,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.spvasm
index a5a3d17..7926704 100644
--- a/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpName %__modf_result_vec2_f16 "__modf_result_vec2_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec2_f16 "__modf_result_vec2_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -116,9 +112,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
index 9deb578..4d3f7f1 100644
--- a/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -55,8 +53,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -101,9 +97,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.spvasm
index afad630..d45e620 100644
--- a/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -55,8 +53,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -101,9 +97,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.spvasm
index d0fb648..caa8a5f 100644
--- a/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.spvasm
index 0900b30..0993b0f 100644
--- a/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.spvasm
index e288d33..5803490 100644
--- a/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.spvasm
index 6f37d80..5347f90 100644
--- a/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm
index 409f2d9..1b1127d 100644
--- a/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.spvasm
index d0e8a3f..2822395 100644
--- a/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm
index f9f9385..8ccac24 100644
--- a/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.spvasm
index bd0cc95..371a276 100644
--- a/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.spvasm
index f08599b..6d12f64 100644
--- a/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm
index 011a304..ee506a5 100644
--- a/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm
index d296576..0e46628 100644
--- a/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm
index 567db65..a0a86b7 100644
--- a/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm
index 790d91c..99dff08 100644
--- a/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm
index 7fadd69..c0b3439 100644
--- a/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm
index e6b6868..6201a2e 100644
--- a/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.spvasm
index 5d428fc..f1ac7cc 100644
--- a/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
index 496192a..63027b2 100644
--- a/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.spvasm
index b2d7a0d..9bfb9ba 100644
--- a/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
index ba73fc2..8957a8f 100644
--- a/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm
index 6ab5b9b..74758b9 100644
--- a/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm
index 687772d..d1a5e43 100644
--- a/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm
index b401470..f1f6ff0 100644
--- a/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.spvasm
index 347729d..bec524f 100644
--- a/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.spvasm
index 5e82a94..36ee33e 100644
--- a/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.spvasm
index 4436da1..8f59a06 100644
--- a/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.spvasm
index a6bc64d..69bcb3b 100644
--- a/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.spvasm
index a9a8974..bc44f33 100644
--- a/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.spvasm
index 428ef35..d58a0a4 100644
--- a/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm
index 7dd5800..17ac3d9 100644
--- a/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.spvasm
index f8fdcbe..4814a37 100644
--- a/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.spvasm
index d5f1603..4881ff3 100644
--- a/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.spvasm
index 40de310..1c58e6d 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.spvasm
index d842c4c..b01cefd 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.spvasm
index dbccb2f..d1a6dba 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.spvasm
index c0f8b82..b82bc9c 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm
index 521af9f..f8fec09 100644
--- a/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.spvasm
index 3a33dc3..d18395f 100644
--- a/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.spvasm
index 4b58a2d..b90ebfa 100644
--- a/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.spvasm
index 7c55163..a4f43da 100644
--- a/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.spvasm
index ae7b059..db0ebce 100644
--- a/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.spvasm
index 4b8687f..747b627 100644
--- a/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm
index 9d8f507..1c4e978 100644
--- a/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm
index f59cc77..1ed0c30 100644
--- a/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.spvasm
index e5c8a8c..2c5be57 100644
--- a/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.spvasm
index 0cc4c1f..c6fdab0 100644
--- a/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm
index de22094..2f89f3e 100644
--- a/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.spvasm
index ac31851..0ada46a 100644
--- a/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm
index 7982fa7..573a45b 100644
--- a/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.spvasm
index 87aa965..d2eedf4 100644
--- a/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.spvasm
index 4586c04..c58cd4e 100644
--- a/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.spvasm
index 299fec3..8a8f4bb 100644
--- a/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm
index 009cb69..5c247ff 100644
--- a/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.spvasm
index 46af9b9..5178e71 100644
--- a/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.spvasm
index 123d553..f79bb66 100644
--- a/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.spvasm
index 040b5ea..05c7598b 100644
--- a/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm
index f765391..12d3fd1 100644
--- a/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.spvasm
index 5d3c118..58bb6c2 100644
--- a/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.spvasm
index 9046265..c57bc84 100644
--- a/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm
index b650f40..c017330 100644
--- a/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.spvasm
index aa3a50f..47915eb 100644
--- a/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.spvasm
index 691ffe6..b985c60 100644
--- a/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm
index d460e0e..f85fbd4 100644
--- a/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm
index ca619e0..d43a5bf 100644
--- a/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.spvasm
index a4dcd33..6c8063b6 100644
--- a/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.spvasm
index b714c35..3b4d071 100644
--- a/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm
index 5fb1304..0e55b9e 100644
--- a/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm
index a81300c..96ed69a 100644
--- a/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm
index 880f681..110639f 100644
--- a/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm
index 4afd30c..628b3a2 100644
--- a/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm
index e26799e..0a5ab5e 100644
--- a/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm
index 1c1fec2..940d3de 100644
--- a/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm
index c573b29..09ff203 100644
--- a/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm
index de6cffe..28230cc 100644
--- a/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm
index 80cec5d..b76cbe4 100644
--- a/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.spvasm
index 406dd76..5743090 100644
--- a/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm
index b015d5c..3e49fd6 100644
--- a/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm
index 1ced8a7..7ed40e1 100644
--- a/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.spvasm
index 05a6388..27d088b 100644
--- a/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.spvasm
index 63828af..bd59826 100644
--- a/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.spvasm
index 84767b7..2471955 100644
--- a/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm
index 9886048..7caf6c1 100644
--- a/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.spvasm
index dee1121..f861eb8 100644
--- a/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.spvasm
index 1c330b9..9630fb5 100644
--- a/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.spvasm
index 810f78e..64674e5 100644
--- a/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.spvasm
index bb215d5..7b232b4 100644
--- a/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.spvasm
index d02b862..4059546 100644
--- a/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.spvasm
index 70b9741..a5cd066 100644
--- a/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.spvasm
index 95a3d7f..0e2e62f 100644
--- a/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.spvasm
index c28d96f..f326c6b 100644
--- a/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.spvasm
index 407b474..6a1f9a6 100644
--- a/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.spvasm
index 3c0410c..9614fe6 100644
--- a/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.spvasm
index bb03ee9..6e37fed 100644
--- a/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.spvasm
index caf37d7..6c058d1 100644
--- a/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.spvasm
index 1442283..3e38e58 100644
--- a/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.spvasm
index 31579e7..284624d 100644
--- a/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.spvasm
index a5ff6cc..407bc8d 100644
--- a/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.spvasm
index a281b85..a719cfa 100644
--- a/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm
index 96b6f2a..75d9263 100644
--- a/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm
index 414a3f7..12e8ae5 100644
--- a/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm
index 504ce37..b6d04e6 100644
--- a/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/089657.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/089657.wgsl.expected.spvasm
index 90c64ee..945ca4b 100644
--- a/test/tint/builtins/gen/literal/select/089657.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/089657.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.spvasm
index 0f89c6f..50cfd9e 100644
--- a/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.spvasm
index 89bc446..b2bccd6 100644
--- a/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.spvasm
index 2ebdd294..12f1eee 100644
--- a/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm
index d40b33d..9463a89 100644
--- a/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.spvasm
index 7a52d80..bd3fa37 100644
--- a/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm
index 0bed2fd..67feaf7 100644
--- a/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm
index 78a0e59..499a4df 100644
--- a/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.spvasm
index ba69bea..3d0a526 100644
--- a/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.spvasm
index dc07087..c22bb2c 100644
--- a/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm
index 29bbe37..d98ed1a 100644
--- a/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm
index 5a7c613..bba3113 100644
--- a/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.spvasm
index 4cb1269..ab15bc8 100644
--- a/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.spvasm
index b5c33c6..2026886 100644
--- a/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/494051.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/494051.wgsl.expected.spvasm
index c42973a..82e9323 100644
--- a/test/tint/builtins/gen/literal/select/494051.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/494051.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.spvasm
index f9ead3a..eb4b560 100644
--- a/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.spvasm
index 2ee77a7..c80f57a 100644
--- a/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm
index f9255f1..dde4af0 100644
--- a/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.spvasm
index 79f42f3..ef097fd 100644
--- a/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm
index 9929413..e1bbdd6 100644
--- a/test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm
index f7b139e..7b1a531 100644
--- a/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm
index 533651e..3a31405 100644
--- a/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.spvasm
index c283f27..b730314 100644
--- a/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.spvasm
index 3458797..8543d14 100644
--- a/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm
index fbbbf36..5602e71 100644
--- a/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm
index 19b9b16..de847bc 100644
--- a/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.spvasm
index 3448993..f585e3a 100644
--- a/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.spvasm
index c285a26..2e7028c 100644
--- a/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm
index 0fdb199..a22f8e2 100644
--- a/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm
index a899ae4..b7c630d 100644
--- a/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm
index 2318b82..d2f6ee6 100644
--- a/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.spvasm
index 78c9c1e..5859941 100644
--- a/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm
index bc8912f..4b97a63 100644
--- a/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm
index 7eb898c..c47140f 100644
--- a/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm
index 83c9c66..78d8091 100644
--- a/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm
index f2781a4..938ef27 100644
--- a/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm
@@ -132,8 +132,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm
index 99996e4..72d5f61 100644
--- a/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm
index b683591..3fc2127 100644
--- a/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm
index 5b865a0..c7e5740 100644
--- a/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.spvasm
index f245375..0e228f9 100644
--- a/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.spvasm
index 1d2e72d..64d911e 100644
--- a/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm
index d711eb1..8842d90 100644
--- a/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm
index e4387e0..d8748c2 100644
--- a/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.spvasm
index fa22e31..86a8b09 100644
--- a/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm
index 31636ac..108510f 100644
--- a/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm
index c874c78..2e90605 100644
--- a/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.spvasm
index 3fe791b..d7b12d0 100644
--- a/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm
index 4eb0655..07447ae 100644
--- a/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.spvasm
index f0f3d7b..a2eba8c 100644
--- a/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.spvasm
index 5890141..d45c7ba 100644
--- a/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.spvasm
index 9a8a449..4cee7c6 100644
--- a/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.spvasm
index 387edcd..64279ea 100644
--- a/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.spvasm
index 245462c..641183e 100644
--- a/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.spvasm
index d0ec167..c4f82df 100644
--- a/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.spvasm
index 2755cf4..d71efe9 100644
--- a/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.spvasm
index 2d0af05..17b9157 100644
--- a/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.spvasm
index 5924de0..917c94d 100644
--- a/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.spvasm
index a1c3055..d388830 100644
--- a/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.spvasm
index 3f19562..ca3d81f 100644
--- a/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.spvasm
index a9a1e92..7f67d27 100644
--- a/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm
index f586e92..e7ea1ad 100644
--- a/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.spvasm
index 5e0a261..da8e2a5 100644
--- a/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.spvasm
index cf01785..0f7fd34 100644
--- a/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm
index 0884445..340287f 100644
--- a/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm
index 19fbbd6..5ac88e2 100644
--- a/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.spvasm
index c7c80cc..22413ca 100644
--- a/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm
index d067772..edcfcc1 100644
--- a/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.spvasm
index 1ff3692..1a50e85 100644
--- a/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.spvasm
index 4306b44..a7ede31 100644
--- a/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.spvasm
index f796a05..d1137b0 100644
--- a/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm
index a129acf..298ff8d 100644
--- a/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.spvasm
index fb9d8d8..ee629aa 100644
--- a/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.spvasm
index 1203289..1f75e95 100644
--- a/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.spvasm
index ae71ea8..c1a9fc3 100644
--- a/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.spvasm
index 87c4be6..b5aedc3 100644
--- a/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.spvasm
index da94c95..6a51d27 100644
--- a/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm
index 83fba6c..85a5bba 100644
--- a/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm
index 620f821..bf73b45 100644
--- a/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.spvasm
index f98e013..22db65d 100644
--- a/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm
index 3280d86..45a1fbc 100644
--- a/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.spvasm
index 673a12d..53fcaee 100644
--- a/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.spvasm
index 0f1bc18..1f4b976 100644
--- a/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm
index a5ff5c3..a576e3d 100644
--- a/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.spvasm
index d926013..d7c28d7 100644
--- a/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.spvasm
index 3a12c10..7f0534e 100644
--- a/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.spvasm
index b0148c2..1ae9501 100644
--- a/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm
index a06a514..94039a3 100644
--- a/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.spvasm
index 72da904..d51e25c 100644
--- a/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.spvasm
index 801384e..8aa4cdc 100644
--- a/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm
index 4d9f992..ab5c8ec 100644
--- a/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.spvasm
index 679b192..ac9764a 100644
--- a/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.spvasm
index c056b01..eeefbe9 100644
--- a/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.spvasm
index a3a98e3..11e1b72 100644
--- a/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm
index 22ccaa0..c9dbc4e 100644
--- a/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm
index 7d554a9..380a886 100644
--- a/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.spvasm
index 1d0f9d7..46d540c 100644
--- a/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.spvasm
index d63879c..9d318b8 100644
--- a/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm
index c7c0169..1376b86 100644
--- a/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.spvasm
index 08fdc5a..1252171 100644
--- a/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.spvasm
index e35680e..8164f30 100644
--- a/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm
index d415ea2..ad3464a 100644
--- a/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.spvasm
index 65afb16..eabe658 100644
--- a/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.spvasm
index 82a839c..8109ef9 100644
--- a/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm
index de8723c..0cff0b4 100644
--- a/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.spvasm
index 7325ae8e..bd6fbde 100644
--- a/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.spvasm
index 2a2bd97..b74551c 100644
--- a/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.spvasm
index b4b0ff6..cdd9264 100644
--- a/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm
index 2a2dbf3..5482148 100644
--- a/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.spvasm
index d6d8604..8c6f98a 100644
--- a/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.spvasm
index 9287d22..6b20895 100644
--- a/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm
index cc435f7..5beed6f 100644
--- a/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.spvasm
index 6bf9559..3c52cd6 100644
--- a/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.spvasm
index 6f8b8ee..e5c65ee 100644
--- a/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm
index 270898d..5a26b25 100644
--- a/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.spvasm
index ca6fa0a..734878e 100644
--- a/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm
index 0cadbb4..7230ecd 100644
--- a/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm
index 3a0207c..11453d2 100644
--- a/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm
index 11a1164..09d75db 100644
--- a/test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.spvasm
index 91b12f5..acee7a9 100644
--- a/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/415879.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/415879.wgsl.expected.spvasm
index 5244e41..8293186 100644
--- a/test/tint/builtins/gen/literal/step/415879.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/415879.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.spvasm
index 9651b1a..7df7689 100644
--- a/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.spvasm
index 88920f7..169862e 100644
--- a/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.spvasm
index ee52191..da86d2d 100644
--- a/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.spvasm
index c00a155..2078c18 100644
--- a/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm
index 64ed8ef..6d66f57 100644
--- a/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.spvasm
index 42a48d4..35c54d0 100644
--- a/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
index 9af17a7..7a1d747 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
index f7faf4b..2828059 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/37b559.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
index 2281016..41474a1 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
index a6ea741..e0bbb74 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/641635.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/641635.wgsl.expected.spvasm
index 15605c1..f23e581 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/641635.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/641635.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/67af87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
index 56735b5..25c10e9 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
index b03c26c..d675541 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
index aef2212..5054e3b 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
index 8b72c340..5486c99 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
index b4163a6..37284cd 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
index 3b6dbd7..700ad5a 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
@@ -26,7 +26,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
index 5914bc1..53aede5f 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
@@ -29,7 +29,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/127fb7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
index cfe3607..d1c4213 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
index fda3265..3db8929 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/49b25b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
index a0b1231..0f0e303 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/5671e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
index f9d90b1..46d1b39 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/5915fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
index b2ea17b..987867d 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
index c1f3a32..ba63829 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
index 95f1d23..689210b 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
index 8da2eb8..412d1d7 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/d07581.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/d07581.wgsl.expected.spvasm
index 93f02a9..1e84a08 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/d07581.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/d07581.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
index 686dcb7..675f954 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/ee1195.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
index 408d4b4..4184905 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/subgroupMatrixStore/f04d67.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
index 0185986..37bda7f 100644
--- a/test/tint/builtins/gen/literal/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm
index b73f1bc..331848d 100644
--- a/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm
index 1303319..6edf538 100644
--- a/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.spvasm
index 8f31730..1878e76 100644
--- a/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.spvasm
index a3fd51f..ef5a194 100644
--- a/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.spvasm
index 8cdf2d2..db3de51 100644
--- a/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm
index f4c365f..6b47d0a 100644
--- a/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm
index c9606d7..43c377e 100644
--- a/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.spvasm
index 62a368c..00788d8 100644
--- a/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.spvasm
index 47c9a7e..0f202b3 100644
--- a/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.spvasm
index 8bf2dd6..6bf0b54 100644
--- a/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.spvasm
index addcaf0..5665267 100644
--- a/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.spvasm
index 237d90a..427a8d9 100644
--- a/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.spvasm
index 5530447..dd03bb4 100644
--- a/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.spvasm
index 98bdd41..8d557c5 100644
--- a/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm
index a9001af..24872ec 100644
--- a/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm
index 346451e..95476d6 100644
--- a/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.spvasm
index da3392e..df8136a 100644
--- a/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.spvasm
index cacb566..b49d69a 100644
--- a/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.spvasm
index 3fbbe68..7cda441 100644
--- a/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm
index 3e28363..91ea71d 100644
--- a/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.spvasm
index e99f320..4351322 100644
--- a/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm
index bab2b8c..9e18303 100644
--- a/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.spvasm
index fc74974..be30f96 100644
--- a/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.spvasm
index ed4848d..e44616a 100644
--- a/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.spvasm
index a81aca8..6931b52 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.spvasm
index 231cae1..7f21d90 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.spvasm
index 5159bb0..79df997 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.spvasm
index 4c80b6f..5b7ee29 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.spvasm
index 5c92633..e9fa013 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.spvasm
index 465a028..2391f9c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.spvasm
index 46a568c..fd8c0bc 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.spvasm
index 1c1eb98..604c151b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.spvasm
index 6d33170..baee272 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.spvasm
index 67f82ee..23d442d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.spvasm
index f2b89aa..5b4d942 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.spvasm
index 6bf6fc3..02491f4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.spvasm
index c492187..91e57db 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.spvasm
index 6b03880..32c50ec 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.spvasm
index 49656a1..ffa725a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.spvasm
index 06b2200..a96b849 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.spvasm
index 1e08b0c..342acc9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.spvasm
index d6cefd9..2a0e04e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.spvasm
index 4b46196..09f0494 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.spvasm
index 60df383..17590fb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.spvasm
index 77bbb6d..d8a659f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.spvasm
index cb3e5dc..3022380 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.spvasm
index 2afe72f..45c9a00 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.spvasm
index 2944c03..2d36924 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.spvasm
index 29d4d48..b4c3951 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.spvasm
index 3fecc3a..e32b3d5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.spvasm
index 58c4355..d85df2c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.spvasm
index aecf436..d575620 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.spvasm
index edc9392..697fc30 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.spvasm
index 8ab51fb..19de4bf 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.spvasm
index 5a29555..77bdda0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.spvasm
index adbb355..96fe6cd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.spvasm
index 64864b0..f695e16 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.spvasm
index 64b251d..2552531 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.spvasm
index 1e2e7fd..dce2c32 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.spvasm
index 1f8966d..2de7180 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.spvasm
index b92fef1..dbf5b7d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.spvasm
index 8379836..c9e5254 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.spvasm
index 1c42dce..4d34c6d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.spvasm
index a557d19..f0e3b3e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.spvasm
index 8f4752d..77ef7b2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.spvasm
index f7d1200..a6cd913 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.spvasm
index 2e390f1..4c19132 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.spvasm
index 7d0c424..2b0083e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.spvasm
index 338ccb9..4a8cc7b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.spvasm
index cd21d1e..49e83a6 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.spvasm
index 2154c11..940a9e7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.spvasm
index f6cc8f6..55cfe42 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.spvasm
index 7a4fa24..49f308b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.spvasm
@@ -155,8 +155,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.spvasm
index d0c89e9..682e0e3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.spvasm
index 1f362fc..d53337c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.spvasm
index 29e5219..464272d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.spvasm
index 09d55ca..f740828 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.spvasm
index 6ddc905..7de0459 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.spvasm
index f74249b..42adc44 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.spvasm
index 158a4f8..01ad761 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.spvasm
index e37ea63..394d84b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.spvasm
index 7c7c04a..2e22beb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.spvasm
index a41c088..18bcb05 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.spvasm
index deaa3c5..c4fad43 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.spvasm
index 71b084f..3564e81 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.spvasm
index 0c51c1f..f86b040 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.spvasm
index b59fc6f..66b68ed 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.spvasm
index ac5401a..82928dd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.spvasm
index 59abcc9..cebf95d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.spvasm
index 39d733d..c8e8245 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.spvasm
index 2c386fc..7ea5556 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.spvasm
index c9211ff..96eb46a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.spvasm
index 2d6435c..08db7c1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.spvasm
index ec8d464..5a34d2f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.spvasm
index 5752401..5ec863b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.spvasm
index 7436590..16d6746 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.spvasm
index a9e19b6..8ae0ab1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.spvasm
index 7aebf54..23a40a9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.spvasm
index 8b7c816..65ba0b1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.spvasm
index c5acb04..bbd6ec5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.spvasm
index 4dea74e..a0988d7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.spvasm
index e15c08a..27d8638 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.spvasm
index 5b0c060..8805f9d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.spvasm
index 6088295..d9f04e8 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.spvasm
index f9a625c..a87e17d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.spvasm
index 3f09d81..3c864b4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.spvasm
index 8f98e6e..ffe9beb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.spvasm
index f71eb63..9a61ca0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.spvasm
index 4f4a632..a4a64eb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.spvasm
index 4ebac31..c8cd916 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.spvasm
index 6c1ebd7..ad4d519 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.spvasm
index cd6d3b1..af5e7ff 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.spvasm
index 6417671..f4954bb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.spvasm
index c90cafe..55a267b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.spvasm
index 9c81a60..20a3be9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.spvasm
index 09ac41e..b303fe1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.spvasm
index 49a510a..05a1c47 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.spvasm
index 3eef424..99803e8 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.spvasm
index 0420ec4..780320a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.spvasm
index b1dd654..f7af049 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.spvasm
index 79b5846..c8078c2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.spvasm
index 97f28db..0c84605 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.spvasm
index d06786a..afb2334 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.spvasm
index 18f6168..1ab55c9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.spvasm
index c2c803b..6faab6b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.spvasm
index 8090063..6f3120c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.spvasm
index fe2831b..4d7d20e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.spvasm
index 18839e9..202fb2b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.spvasm
index 8384fa7..839092f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.spvasm
index c681779..f55f3a8 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.spvasm
index afc862c..5c36a8d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.spvasm
index 6b21fba..92b7018 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.spvasm
index 2a95f85..6f6818e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.spvasm
index 3ccfeaa..00f91b9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.spvasm
index 30f8b9a..2768118 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.spvasm
index 3fc3420..fb29bb4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.spvasm
index b872655..824c694 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.spvasm
index 26da909..129fa62 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.spvasm
index 19c8e65..b34ae8f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.spvasm
index f345824..3767e78 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.spvasm
index eaff483..bf9af6c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.spvasm
index 772a492..57da566 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.spvasm
index a39eba5..48f6af5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.spvasm
@@ -110,28 +110,6 @@
                OpDecorate %11 DescriptorSet 1
                OpDecorate %11 Binding 2
                OpDecorate %11 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
 %prevent_dce_block = OpTypeStruct %v2uint
@@ -326,28 +304,6 @@
                OpDecorate %11 DescriptorSet 1
                OpDecorate %11 Binding 2
                OpDecorate %11 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
 %prevent_dce_block = OpTypeStruct %v2uint
@@ -546,30 +502,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.spvasm
index 5e3a830..0cfc311 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.spvasm
index 2801308..148c919 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.spvasm
index 989618e..18f57a3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.spvasm
index 247a0ce..e12f3ad 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.spvasm
index aff63fb..5e95bc6 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.spvasm
index 8e85d87..d7f55ba 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.spvasm
index 606d518..53adad5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.spvasm
index 04b9502..34f0b93 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.spvasm
index 25f2394..0a63ca3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.spvasm
index 82f6ad6..2d72abe 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.spvasm
index 2554fa8..aa7e4a4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.spvasm
index 1f372a4..ad56b1e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.spvasm
index 74ad992..d25ec2b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.spvasm
index 16b1d9a..eafd0f0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.spvasm
index 7eeae8f..782f54f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.spvasm
index 07e4cf5..4e27a60 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.spvasm
index 5ff429f..6869c7a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.spvasm
index 04bc574..4e7431d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.spvasm
index 4f39926..d6e03c0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.spvasm
index ba7379f..c634620 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.spvasm
index 23e6426..38e92aa 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.spvasm
index 2baebe0..021f656 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.spvasm
index 0a2a52e..f65362c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.spvasm
index 40b6c33..fb87e9f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.spvasm
index e0435ad..d040a69 100644
--- a/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.spvasm
index 39bc9f7..a12cf07 100644
--- a/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm
index a2cc39e..5018594 100644
--- a/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.spvasm
index be3e400..9c33f7f 100644
--- a/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.spvasm
index 0c15d06..ff160b5 100644
--- a/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.spvasm
index 292e473..42afad0 100644
--- a/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.spvasm
index d7da4a0..11c97f8 100644
--- a/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.spvasm
index 2d26ad2..545eb12 100644
--- a/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.spvasm
index d19717c..1b93bab 100644
--- a/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.spvasm
index a0a68af..c7c6fe1 100644
--- a/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.spvasm
index ed8aa62..fabf1ee 100644
--- a/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.spvasm
index 52eed80..6be99fe 100644
--- a/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.spvasm
index 330d109..53eaf8d 100644
--- a/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm
index 0812a68..a58a404 100644
--- a/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.spvasm
index 03f6420..1fb1643 100644
--- a/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.spvasm
index 59fdf77..50e3674 100644
--- a/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm
index 29add9c..a017634 100644
--- a/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.spvasm
index 426bae5..d5f8849 100644
--- a/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.spvasm
index d179d18..5818941 100644
--- a/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.spvasm
index 064481c..0b19b63 100644
--- a/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.spvasm
index 1e62cf0..3e0778f 100644
--- a/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.spvasm
index 6b3cd6d..e4a3040 100644
--- a/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.spvasm
index 5b4ba46..0bd0c49 100644
--- a/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.spvasm
index 09ae668..b8c8c47 100644
--- a/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.spvasm
index c44c697..c713db6 100644
--- a/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.spvasm
index 2b8fb8b..a50df67 100644
--- a/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.spvasm
index c05a18d..1fc19f5 100644
--- a/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.spvasm
index c2690f2..e25f87e 100644
--- a/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.spvasm
index 2cfb9e5..2eee18e 100644
--- a/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.spvasm
index 3fef8fe..0d8b09d 100644
--- a/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.spvasm
index 1537857..bdb6a4a 100644
--- a/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.spvasm
index 8935e5d..7b7feba 100644
--- a/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.spvasm
index 88f517d..b18fc9f 100644
--- a/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.spvasm
index 0a1d299..4b6cafe 100644
--- a/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.spvasm
index b11606a..aa3710a 100644
--- a/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.spvasm
index bf339ed..6fc2916 100644
--- a/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.spvasm
index e702794..b1dc81e 100644
--- a/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.spvasm
index eab9fe6..37d0fa3 100644
--- a/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm
index ee65ec9..d1b7d04 100644
--- a/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.spvasm
index 153abc1..219cc63 100644
--- a/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.spvasm
index a766bee..d542879 100644
--- a/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.spvasm
index 0917baf..8fa74433 100644
--- a/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.spvasm
index 8ef4cc6..58fb92b 100644
--- a/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.spvasm
index 4634fb7..3621bb6 100644
--- a/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.spvasm
index e5c76c1..ac3ba18 100644
--- a/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.spvasm
index 1a5bf27..b07c02c 100644
--- a/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.spvasm
index e696b51..0186cab 100644
--- a/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.spvasm
index d08fda4..a065098 100644
--- a/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.spvasm
index a91df19..7c1deb8 100644
--- a/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.spvasm
index 1cfe6b3..7f6755b 100644
--- a/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.spvasm
index b1245db..3ccf1f3 100644
--- a/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.spvasm
index 2571551..2e88c83 100644
--- a/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.spvasm
index 909819c..7230c65 100644
--- a/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.spvasm
index 06c9663..b372122 100644
--- a/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.spvasm
index 58cf12e..6ef045f 100644
--- a/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.spvasm
index 9277b9a..d99b504 100644
--- a/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.spvasm
index 1dc9251..a72950e 100644
--- a/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.spvasm
index eb434e1..ec29ea7 100644
--- a/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.spvasm
index 501da83..41d4474 100644
--- a/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.spvasm
index bd7d135..e4c06d9 100644
--- a/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.spvasm
index f142d9d..5bc8eb1 100644
--- a/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.spvasm
index 68a99c9..8a6c9e8 100644
--- a/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.spvasm
index 006028e..6fceaec 100644
--- a/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.spvasm
index a76b817..3349513 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm
index a8b3f4d..fc0d15c 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.spvasm
index 3bf0db0..18806b2 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.spvasm
index f89d133..958a5ca 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm
index 068b22d..8957bbf 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm
index 9196b13..e11458f 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm
index 09e6ee0..940eb9c 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.spvasm
index f0c10c6..3ffaa6c 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.spvasm
index a9bcd4e..846f424 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.spvasm
index 397caa7..5486f4d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.spvasm
index a9051f6..e1362d4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.spvasm
index 0e1959b..13589e9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.spvasm
index dfefafd..a833e2e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.spvasm
index 0eadfbd..3f9cdc5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.spvasm
index 6bd4b89..e7a8096 100644
--- a/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.spvasm
index bcfa602..e5eaf64 100644
--- a/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.spvasm
index e645170..be98502 100644
--- a/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.spvasm
index db8127d..6c14639 100644
--- a/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.spvasm
index 973bb5c..21c6b6c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.spvasm
index e1439d1..ae735e0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.spvasm
index adfb0a2..82faab5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.spvasm
index 12ecaac..c2c796e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.spvasm
index 4d3f9b1..6601a04 100644
--- a/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.spvasm
index cf81aa3..6207a12 100644
--- a/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.spvasm
index 57b1b0a..67b80a3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.spvasm
index 2228cc3..e130604 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.spvasm
index 98b5ada..cbc2155 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.spvasm
index bead5a6..157d9f8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.spvasm
index 93445b0..087fbcf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.spvasm
index 3fc8b5c..fac1c1c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm
index d634956..b434638 100644
--- a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.spvasm
index f9e3395..beb8a15 100644
--- a/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.spvasm
index aa4ec6a..49e8c7e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.spvasm
index 54a62df..6eb3521 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.spvasm
index 7a837b2..e8d3718 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.spvasm
index 7a50275..177a429 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm
index dc5d9dd..aac8e4e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.spvasm
index 321055e..407dd06 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.spvasm
@@ -119,28 +119,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -439,28 +417,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -763,30 +719,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.spvasm
index 3f498d7..b9fec93 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.spvasm
index 5aa8a18..092c519 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm
index da865b6..6b9c068 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.spvasm
index 0f1d79c..d12e98a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.spvasm
index b1a4925..81c07ca 100644
--- a/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.spvasm
index db1dadb..1e30e93 100644
--- a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.spvasm
index 40c5de5..3682e9b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.spvasm
index 39175fd..05600ce 100644
--- a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.spvasm
index d90c4cb..4603c32 100644
--- a/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.spvasm
index 4d4220d..7c92fbc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.spvasm
index 5329a09..2872fb2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.spvasm
index 31cb008..38d006f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.spvasm
index 7b51215..2a653d1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.spvasm
index b480e2b..2f4d8d3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.spvasm
index 5ca485b..042b0cb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.spvasm
index d450632..daea146 100644
--- a/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.spvasm
index 50c0eb6..6ada68a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.spvasm
index 6bb7f2a..6f77d64 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.spvasm
index dc723ca..7fdca25 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.spvasm
index ddb8c34..31bdb51 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.spvasm
index 8813a8a..eb58c2a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.spvasm
index 9c3f208..47900c7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.spvasm
index ddbcdd4..cca45b6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.spvasm
index 6c314b5..2917809 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.spvasm
index 30fffad..61e0fac 100644
--- a/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.spvasm
index 37aa122..6897eba 100644
--- a/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.spvasm
index 8e40551..5835b48 100644
--- a/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.spvasm
index 8117377..ad5c4d1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.spvasm
index 5578f1c..2461845 100644
--- a/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.spvasm
index 36134f2..0e1ac85 100644
--- a/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.spvasm
index 452dc4d..d11e48a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.spvasm
index 321a820..8ac8e48 100644
--- a/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.spvasm
index b97c997..f75db7b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.spvasm
index 1045006..4198b29 100644
--- a/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.spvasm
index b4e3b6a..351fe9a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.spvasm
index 986438f..062e957 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.spvasm
index f54b433..5ee9c38 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.spvasm
index 77d49e2..52ac621 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.spvasm
index a850202..b8e3633 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.spvasm
index c4cb9da..f1e3828 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.spvasm
index 12bc42e..33e2c3c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.spvasm
index df2b47f..1a7a6be 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.spvasm
index a6926b5..05c2af3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.spvasm
index cc2de0a..a3a2197 100644
--- a/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.spvasm
index fde2b3a..3407c50 100644
--- a/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.spvasm
index 3193377..68271e5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.spvasm
index e536297..a2a21c3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.spvasm
index 450d23e..7fb0e78 100644
--- a/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.spvasm
index 1d468d3..3573515 100644
--- a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm
index 296cf1a..c8171bd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.spvasm
index 71c2107..925c691 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.spvasm
index 77e22dc..7d212a3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.spvasm
@@ -155,8 +155,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.spvasm
index 5625541..31f8c06 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.spvasm
index bd89fd9..8b7ad91 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.spvasm
index 209da01..9637d08 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.spvasm
index 749b871..f8a5d22 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.spvasm
index 8a86ae3..6be5d2e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.spvasm
index 7643bba..5996770 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm
index 9f3c50a..f4e3a2d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.spvasm
index 26459e1..88f5c38 100644
--- a/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.spvasm
index 6df3075..fff334a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.spvasm
index 7d90c3f..a47d099 100644
--- a/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.spvasm
index 1be9254..49cb7ec 100644
--- a/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.spvasm
index de42fe5..8d64e16 100644
--- a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.spvasm
index a7c6f0a..e365d77 100644
--- a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.spvasm
index 52f16b9..c80c81d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.spvasm
index cf6c862..56b9311 100644
--- a/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.spvasm
index 4c10367..8fd6f41 100644
--- a/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.spvasm
index d3cbb0f..8a8b9ad 100644
--- a/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.spvasm
index 025f7a8..a9ca162 100644
--- a/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm
index 83a4e5f..64b4c93 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.spvasm
index 5846ced..da8ffe7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.spvasm
index 2a883f5..f39669e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.spvasm
index bf1218b..4c0ce0c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.spvasm
index 1f200ed..38f4e84 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.spvasm
index 3fac381..a9c3f20 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.spvasm
index 8304692..c62d84a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.spvasm
index 0dce9d1..37a5de2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.spvasm
index 2c86452..d8091dc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.spvasm
index f398a53..54826fa 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.spvasm
index 9613638..eb6d743 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm
index 9723937..3f45820 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.spvasm
index ad26b9e..6ea8b76 100644
--- a/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm
index 50c3c6e..8e9dca7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.spvasm
index 6db6fc7..8755fe5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.spvasm
index fda5a2b..c6e6a8c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.spvasm
index d69c7ce..2c27c41 100644
--- a/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.spvasm
index 7cbab73..65c684d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.spvasm
index dd4b2b1..cb73f47 100644
--- a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.spvasm
index 78a557e..f2d6366 100644
--- a/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.spvasm
index f9980b7..959e1cf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.spvasm
index b4aa3a0..6c981ac 100644
--- a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.spvasm
index 2ad33eb..b495d8d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.spvasm
index 694aeba..e0a23f6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.spvasm
index d3a7e78..608eaba 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.spvasm
index d8e6f92..5d069b5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.spvasm
index a6fa1f6..04fe464 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.spvasm
index e09437d..854ba30 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.spvasm
index f1dd281..ac4cfc6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.spvasm
index 4498020..4d324a7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.spvasm
index af5f11e..29bfb1f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.spvasm
index be27499..8466f3e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.spvasm
index 0c0ebf0..7506baa 100644
--- a/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.spvasm
index 4943de9..f5d2632 100644
--- a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm
index 1428277..dff7554 100644
--- a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.spvasm
index db50cf5..79a6170 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.spvasm
index 5c03c5d..c825f8d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.spvasm
index aadf56b..a8a2b5c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm
index b80cd5c..b6568c6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.spvasm
index f87bace..a2a58d1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.spvasm
index e9f5d90..1fd0ae5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm
index 123a657..7ba2696 100644
--- a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.spvasm
index e112c4a..1aafd67 100644
--- a/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.spvasm
index 83f5583..3acc5bb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.spvasm
index 77ff03f..8ecc8d7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.spvasm
index 62c25b3..72da8c8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.spvasm
index 31b7b57..e669082 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.spvasm
index 3f150cf..f50c890 100644
--- a/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm
index e7c853e..e4541f4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.spvasm
index 61ea142..44c78de 100644
--- a/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.spvasm
index b7cfc3f..c8f3880 100644
--- a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.spvasm
index 308627d..87e1df8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.spvasm
index 445a274..5e0f5bd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm
index df3a411..14bc971 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm
@@ -119,28 +119,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -444,28 +422,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -773,30 +729,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.spvasm
index ddcda42..09a54be 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.spvasm
index a5a7d45..4292ba9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.spvasm
index a3db2ac..c4c88dd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.spvasm
index 0c066aa..68f26a3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.spvasm
index 392aa13..f8cd103 100644
--- a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.spvasm
index 1dbc42e..8efd70a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.spvasm
index 092c8da..8679ca6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.spvasm
index 687c302..7df1915 100644
--- a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.spvasm
index d216434..ea84fdd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.spvasm
index 666eee1..06cb755 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.spvasm
index ac551ce..9bdc23a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.spvasm
index 2c6d5cf..6cea4b4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.spvasm
index dc9b10c..1367ea4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm
index 0454b02..f9ea9bd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.spvasm
index 5831b03..9fcd385 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.spvasm
index 964d6a3..6219b72 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.spvasm
index 6bf2df4..6b60c15 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.spvasm
index 43caed6..813a7cd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.spvasm
index 5c7a160..e5239e6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.spvasm
index e8cdb84..d2cea0e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.spvasm
index 311d27b..61b6348 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.spvasm
index 9528ea5..1c78ed1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.spvasm
index 920d7ea..9971e97 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.spvasm
index 80a4962..a1643af 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm
index acd07db..7337f21 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.spvasm
index 89389e3..4a58295 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.spvasm
index 3d8d8ab..c08d0de 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.spvasm
index 561d16b..f6034ac 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.spvasm
index 7f2b2cb..1ad0627 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.spvasm
index aa9e0fa..e9e93d7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm
index 8c503a9..b011b1b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.spvasm
index 44a8c62..4334500 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.spvasm
index 885b7b8..07456de 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.spvasm
index 2502e32..7d385cf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.spvasm
index 59c1270..fff31ef 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.spvasm
index f1b7f35..62f3eb8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.spvasm
index 9d16f38..da764fe 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.spvasm
index ce0a1ef..936d37c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.spvasm
index a48abc1..5ae732e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.spvasm
index 8c07fb5..e8ad03a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.spvasm
index 8ff50c0..9972188 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.spvasm
index 5f1231b..48d1a87 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.spvasm
index 3a31d35..9fa849d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.spvasm
index e1f9578..1fa8382 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.spvasm
index 4e14dc4..8952748 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.spvasm
index 2a5a89c..1312f48 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.spvasm
index 773987d..1348d47 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.spvasm
index bfba762..bf6df5e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.spvasm
index 31e84dc..70ac9f8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.spvasm
index 530d1b1..d55cd60 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.spvasm
index 22c4dfe..0968b78 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.spvasm
index fa97193..ab0cf39 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.spvasm
index 7323928..420c0c4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.spvasm
index 8e3fe06..bf501bd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm
index 355c27a..1feba03 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm
index 5865001..37f36d6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.spvasm
index 89e9821..d1e2114 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.spvasm
index f8653be..d898e0f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.spvasm
index ee94777..ae82ab8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.spvasm
index a6636b9..7073de2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.spvasm
index b056fb8..faf7a75 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.spvasm
index 9bcab7d..8631f4c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.spvasm
index f99f2c6..e814c42 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.spvasm
index 1ec3383..22d5c9f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.spvasm
index dfaab62..ae55f0a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.spvasm
index bef6742..cca0465 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.spvasm
index f033108..dce06e4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.spvasm
index 585ed1f..1b5e3ec 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.spvasm
index 5a27bef..5850473 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.spvasm
index c029ba2..5146e66 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.spvasm
index 539811c..fb1d3af 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.spvasm
index 10c8fea..71f1974 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.spvasm
index d6d6920..56d0e4b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.spvasm
index da7b1b8..954076a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.spvasm
index 304f95d..8bc2f94 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.spvasm
index f10f168..27019f4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.spvasm
index b331d8f..0bc5e0c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.spvasm
index 267132f..47131cf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.spvasm
index c8438c8..b2ff3c9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.spvasm
index ce7a39a..16fc418 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.spvasm
index 385e7ae..b600547 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.spvasm
index bb25ff5..c645df2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm
index b027909..48ec2b7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.spvasm
index 8279326..b8add49 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.spvasm
index 34896ea..a24be76 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.spvasm
index ef35c81..f8c38e0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.spvasm
index 7a26fa6..7bc398a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.spvasm
index 62aacb4..7a71c65 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.spvasm
index 4263c2a..ce354cc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.spvasm
index 35d93d2..5ae76e6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.spvasm
index 933a44f..107584a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.spvasm
index 71fef56..bc7723b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.spvasm
index 5119b67..e34db4f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.spvasm
index 8713651..cc80971 100644
--- a/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.spvasm
index ef2c565..a2a18b9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.spvasm
index a8051e4..ec90e28 100644
--- a/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.spvasm
index ab95733..122a65c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.spvasm
index fdb6f84..25c3dd1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.spvasm
index 12a87fd..0dff9de 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.spvasm
index 0c5cef2..82526ee 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.spvasm
index 12f5381..07872bf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.spvasm
index b8d4620..9dd08b8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.spvasm
index 76f39d9..32d7648 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.spvasm
index f69533b..d0054f3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.spvasm
index 784c6cc..332c885 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.spvasm
index 1d3907c..5b3fb74 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.spvasm
index c75e64b..05107e3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.spvasm
index 602cfca..0f928fc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.spvasm
index 9967d42..d5e32e1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.spvasm
index b330c36..7344aff 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.spvasm
index 256e183..8d0652a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.spvasm
index 791f8a8..f2ac592 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.spvasm
index f5e53ca..0c7b2c7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.spvasm
index 7a946dc..405f141 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.spvasm
index 79cbb4e..61131dc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.spvasm
index 8ac02f6..58bf0e9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.spvasm
index fac66f0..d45d18d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.spvasm
index 9f004f3..7676cfe 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.spvasm
index 3379152..9a6aa53 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.spvasm
index 5eb89aa..cf2c728 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.spvasm
index b808cb5..e6d08aa 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.spvasm
index 924ebdd..e3e12c3 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.spvasm
index 91834a6..4088e42 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.spvasm
index cc15c9e..f22f238 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.spvasm
index 7011f2f..ec1defc 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.spvasm
index 22702be..e537ebb 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.spvasm
index c1128e7..a9a8975 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.spvasm
index 392fbbf..3e8e01c 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.spvasm
index 913957c..fa879f3 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.spvasm
index cf09ecc..04f4ec8 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.spvasm
index fc68b13..652815d 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.spvasm
index 88def4b..62de309 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.spvasm
index f591926..7e6fa1e 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.spvasm
index e04145a..35f15de 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.spvasm
index a2885da..b48999d 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.spvasm
index acb2616..471b4d3 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.spvasm
index e3946e3..f27b94d 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.spvasm
index eb6c138..a79dd91 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.spvasm
index 83cb30b..e25e0a3 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.spvasm
index 837c435..0c17856 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.spvasm
index e25be5d..7f0f344 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.spvasm
index 06668f9..2ae505d 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.spvasm
index 3ae9f057..0de1336 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.spvasm
index 9dc3eae..43ebde8 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.spvasm
index 599e559..7f3f879 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.spvasm
index 0816d3c..6dfde08 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.spvasm
index 682b8bf..e151ac0 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.spvasm
index 16d1c36..af083f5 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.spvasm
index cab7420..701bd30 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.spvasm
index c5759dc..b13d68e 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.spvasm
index f3ebcc4..c7b5923 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.spvasm
index dde4f93..39c33b6 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.spvasm
index ac8dae0..2d40d12 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.spvasm
index 417716f..af36d41 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.spvasm
index a35ae48..feedb3e 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.spvasm
index 7fb6c5a..e2efcde 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.spvasm
index 0c37f34..dbb00d9 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.spvasm
index 8f2c9c4..8bdff58 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.spvasm
index 3c50355..1f97342 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.spvasm
index 1107c15..13f0091 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.spvasm
index f30152e..cae5b5c 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.spvasm
index 4acbbb9..7be66f3 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.spvasm
index 80634c9..d8f28ac 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.spvasm
index 32dd711..2b9a0f2 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.spvasm
index d91b2e5..46ae8b8 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.spvasm
index 821e4f7..665a040 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.spvasm
index fd80e1c..1e5ec33 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.spvasm
index 0075f7b..1166f01 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.spvasm
index f1e3aab..02f7066 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
index 74744ce..ac11499 100644
--- a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
@@ -123,28 +123,6 @@
                OpDecorate %10 NonWritable
                OpDecorate %arg_1 DescriptorSet 1
                OpDecorate %arg_1 Binding 1
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -451,28 +429,6 @@
                OpDecorate %10 NonWritable
                OpDecorate %arg_1 DescriptorSet 1
                OpDecorate %arg_1 Binding 1
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -783,30 +739,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
index fe26eec..7dbf003 100644
--- a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
@@ -190,8 +190,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
index ec703e6..a5b093c 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
index 8d7b4ba..959e300 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
index 76441f7..8616534 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
index 29fa37a..66db90f 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
index 619eeca..4a33880 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
index 16a17ee..8087eb4 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
index a1bb761..d4e449f 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
index a532322..9e4c68d 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
index f34c4ae..67fe00c 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm
index 030039f..9ba875f 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
index ae28151..5886bd6 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm
index 12bcc2c..3dbab8f7 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm
index 685b035..9b2bcbb 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.spvasm
index ea60694..7c4d32b 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.spvasm
index 04016dd..1937f40 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.spvasm
index 202d3ee..46773ae 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.spvasm
index e9125b8..c976528 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
index f8f9fd4..02e7981 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.spvasm
index 3d426b5..26af494 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm
index 512d1e4..0f5ac7e 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm
index 134a701..e4830e6 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
index 2da9ca2..ba99b8e 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
index f3eacf8..b7d02b4 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm
index 6823699..ff4801c 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm
index c106441..6edd16f 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.spvasm
index c531144..6e420c8 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.spvasm
index 1e5da25..8005173 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm
index fc83c1a..91d75b2 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.spvasm
index e37b47a..56a94b2 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.spvasm
index b529783e..a513ce4 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.spvasm
index dc06663..e38d876 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.spvasm
index bd46b66..4d2c8f8 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.spvasm
index 968c9d2..61ee4ba 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.spvasm
index 542c2b7..6dbc51f 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.spvasm
index 83e88e0..4b5f577 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.spvasm
index 4ac51b8..3f2b962 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.spvasm
index 1e0ea3f..ecf53e8 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm
index 500a1c8..71d0f5f 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm
index 9276d66..baea948 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.spvasm
index 9c431f2..ccbb37c 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.spvasm
index 2158ec4..b8efa03 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm
index bc99a61..70ad5c5 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm
index d845f55..90558bf 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
index ad9846b..19e21ef 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.spvasm
index b92c715..4791ea3 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
index 081e883..cd99a65 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
index abc8333..b1f9584 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.spvasm
index c53c2f4..feaff3c 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.spvasm
index 22ef254f..60da5fe 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.spvasm
index 3d21015..2d79ddf 100644
--- a/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm
index 6acdff0..fa37b13 100644
--- a/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm
index 8130ffa..3ef692c 100644
--- a/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm
index 87d7a6f..5f40f71 100644
--- a/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.spvasm
index 01563b4..b73d476 100644
--- a/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm
index abc251d..6ec3139 100644
--- a/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm
index 8819da9..360df56 100644
--- a/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.spvasm
index 94b91e7..ed4a731 100644
--- a/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.spvasm
index b7a5cf9..4800dd7 100644
--- a/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.spvasm
index 93c8850..c80cf21 100644
--- a/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.spvasm
index 7e2a07c..7570717 100644
--- a/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.spvasm
index a7d1963..ff4b47f 100644
--- a/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.spvasm
index 4c79fd7..ec91ff9 100644
--- a/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.spvasm
index 4cb39cd..d2c7e0e 100644
--- a/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.spvasm
index cbfc15b..29e3387 100644
--- a/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.spvasm
index 43052f02..9a2162a 100644
--- a/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.spvasm
index 05de48f..860dac9 100644
--- a/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm
index 9422e53..bfb8d89 100644
--- a/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.spvasm
index 9c7e0a2..3ca5fd4 100644
--- a/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.spvasm
index fee2164..71c95c1 100644
--- a/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.spvasm
index 2a3bde8..d40a975 100644
--- a/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm
index dbc3e17..dc7e29e 100644
--- a/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.spvasm
index faf9daa..6d4fc55 100644
--- a/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm
index adc5bfa..9d5321d 100644
--- a/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.spvasm
index 5161ce7..885bf7a 100644
--- a/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm
index 5e54a6a..476c822 100644
--- a/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.spvasm
index ee767c2..de967ff 100644
--- a/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.spvasm
index 5ca054d..46b2407 100644
--- a/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.spvasm
index 357d466..7b67329 100644
--- a/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm
index 039149a..3cfe21c 100644
--- a/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.spvasm
index 580a8a8..ba2c52c 100644
--- a/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.spvasm
index 8ff4931..4bdcae5 100644
--- a/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.spvasm
index 5edabf9..6cf4f12 100644
--- a/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.spvasm
index dd2157f..20eb749 100644
--- a/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.spvasm
@@ -130,8 +130,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.spvasm
index 061332a..3127a7f 100644
--- a/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm
index fb78397..cbc38a1 100644
--- a/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm
index f05956b..b27d29a 100644
--- a/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm
@@ -120,8 +120,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.spvasm
index 5f27fba..fcfa4d2 100644
--- a/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm
index f36d6b6..976c35a 100644
--- a/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm
@@ -124,8 +124,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm
index cd443dd..15dcf25 100644
--- a/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
index 9095bb9..64d00bc 100644
--- a/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm
index 415efde..2b6d24c 100644
--- a/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm
index d12af71..8aa0cc5 100644
--- a/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm
index 36604ba..ea4da85 100644
--- a/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.spvasm
index 1fcc028..e19faee 100644
--- a/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.spvasm
@@ -126,8 +126,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.spvasm
index ee47c33..e8b0f31 100644
--- a/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/002533.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/002533.wgsl.expected.spvasm
index 17f1483..fdc23c4 100644
--- a/test/tint/builtins/gen/var/abs/002533.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/002533.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/005174.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/005174.wgsl.expected.spvasm
index 70baff0..8abeddc 100644
--- a/test/tint/builtins/gen/var/abs/005174.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/005174.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.spvasm
index fec4dd4..78fee8e 100644
--- a/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.spvasm
index 70755c9..101876e 100644
--- a/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.spvasm
index 8bd6953..6f01263 100644
--- a/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.spvasm
index 80bb382..1ae1cf6 100644
--- a/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.spvasm
index 7a1a446..e295078 100644
--- a/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.spvasm
@@ -127,8 +127,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.spvasm
index 5f549d3..1719c1f 100644
--- a/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.spvasm
index 29a2b90..40e4a5d 100644
--- a/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.spvasm
index 0d13ca0..f4294eb 100644
--- a/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.spvasm
index fc2575e..64cef36 100644
--- a/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.spvasm
index 37acc54..953e6f9 100644
--- a/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.spvasm
index 5c173d3..9988f00 100644
--- a/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.spvasm
index 0099005..5ba1a74 100644
--- a/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.spvasm
index 9260475..eadfba8 100644
--- a/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.spvasm
index e52abb0..087b066 100644
--- a/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.spvasm
index 867018e..08a9d6d 100644
--- a/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.spvasm
index 73eea57..c2584fc 100644
--- a/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.spvasm
index 2dc24de..95b4e00 100644
--- a/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.spvasm
index 74294b8..3029953 100644
--- a/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.spvasm
index b3981bd..7087a97 100644
--- a/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.spvasm
index 87cf68c..ca1937b 100644
--- a/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.spvasm
index 42648a1..120e9d2 100644
--- a/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.spvasm
index a877a47..0a096fb 100644
--- a/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.spvasm
index 899ce4b..67bd194 100644
--- a/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/069188.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/069188.wgsl.expected.spvasm
index 6cc5104..8a03f72 100644
--- a/test/tint/builtins/gen/var/acos/069188.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/069188.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.spvasm
index 407fe44..ef5d904 100644
--- a/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/203628.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/203628.wgsl.expected.spvasm
index 6f7a804..b67e486 100644
--- a/test/tint/builtins/gen/var/acos/203628.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/203628.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.spvasm
index 9223c7b..301676b 100644
--- a/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/489247.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/489247.wgsl.expected.spvasm
index d84b7b8..5abdc07 100644
--- a/test/tint/builtins/gen/var/acos/489247.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/489247.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.spvasm
index 2c5c853..184c48d 100644
--- a/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.spvasm
index 075451d..128399a 100644
--- a/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.spvasm
index 5ba3a1c..d8ad694 100644
--- a/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.spvasm
index f6ca17d..0a5cb9a 100644
--- a/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.spvasm
index 838ce2e2..f0985dc 100644
--- a/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.spvasm
index 15289ab..7532a81 100644
--- a/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.spvasm
index 7b06c69..7c51ecb 100644
--- a/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.spvasm
index 00e4d17..f7ce475 100644
--- a/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.spvasm
index 847475f..e666e16 100644
--- a/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.spvasm
index 2daaa0f..8033c90 100644
--- a/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.spvasm
index 0f9654c..be5e85f 100644
--- a/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.spvasm
index 4d13047..84971dc 100644
--- a/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.spvasm
index 550d0c4..9af30c5 100644
--- a/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.spvasm
index 069772c..e65adf2 100644
--- a/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.spvasm
index 47103bb..cb7be0d 100644
--- a/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.spvasm
index 880c04c..0510714 100644
--- a/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.spvasm
index 0761485..75174c6 100644
--- a/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.spvasm b/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.spvasm
index fac3917..bfa4ea2 100644
--- a/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.spvasm
index 8fc5683..a22889f 100644
--- a/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.spvasm
index fad098b..9fefc10 100644
--- a/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.spvasm
index 1d251ca..709158e 100644
--- a/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/all/f46790.wgsl.expected.spvasm b/test/tint/builtins/gen/var/all/f46790.wgsl.expected.spvasm
index 66db032..95735f5 100644
--- a/test/tint/builtins/gen/var/all/f46790.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/all/f46790.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/any/083428.wgsl.expected.spvasm b/test/tint/builtins/gen/var/any/083428.wgsl.expected.spvasm
index cdf8835..e1b7a92 100644
--- a/test/tint/builtins/gen/var/any/083428.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/any/083428.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.spvasm b/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.spvasm
index 716d352..e7da157 100644
--- a/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.spvasm
index 61142b7..5c1fdc5 100644
--- a/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.spvasm
index e4aafde..c9a0c2f 100644
--- a/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/arrayLength/1cf529.wgsl.expected.spvasm b/test/tint/builtins/gen/var/arrayLength/1cf529.wgsl.expected.spvasm
index 3ae0569..0c79732 100644
--- a/test/tint/builtins/gen/var/arrayLength/1cf529.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/1cf529.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
       %SB_RO = OpTypeStruct %_runtimearr_uint
diff --git a/test/tint/builtins/gen/var/arrayLength/3a93e6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/arrayLength/3a93e6.wgsl.expected.spvasm
index 0af292a..fbd2fe0 100644
--- a/test/tint/builtins/gen/var/arrayLength/3a93e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/3a93e6.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
 %_runtimearr_float = OpTypeRuntimeArray %float
       %SB_RO = OpTypeStruct %_runtimearr_float
diff --git a/test/tint/builtins/gen/var/arrayLength/9ea96d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/arrayLength/9ea96d.wgsl.expected.spvasm
index 4e4c73b..f05e233 100644
--- a/test/tint/builtins/gen/var/arrayLength/9ea96d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/9ea96d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %half = OpTypeFloat 16
 %_runtimearr_half = OpTypeRuntimeArray %half
       %SB_RO = OpTypeStruct %_runtimearr_half
diff --git a/test/tint/builtins/gen/var/arrayLength/bf7d97.wgsl.expected.spvasm b/test/tint/builtins/gen/var/arrayLength/bf7d97.wgsl.expected.spvasm
index 2c79b63..22f3d17 100644
--- a/test/tint/builtins/gen/var/arrayLength/bf7d97.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/bf7d97.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
 %_runtimearr_int = OpTypeRuntimeArray %int
       %SB_RO = OpTypeStruct %_runtimearr_int
diff --git a/test/tint/builtins/gen/var/asin/064953.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/064953.wgsl.expected.spvasm
index 35d9564..fd327f6 100644
--- a/test/tint/builtins/gen/var/asin/064953.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/064953.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.spvasm
index 1cabf75..b2f97eb 100644
--- a/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.spvasm
index f348163..b2236fa 100644
--- a/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.spvasm
index cd4f7d5..dbf429b 100644
--- a/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.spvasm
index baeab60..7a47426 100644
--- a/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.spvasm
index 618ed7a..e27f0f6 100644
--- a/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.spvasm
index aa7c34d..15c8316 100644
--- a/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.spvasm
index 2a19167..b8d59db 100644
--- a/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.spvasm
index 090afe3..1a4f730 100644
--- a/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.spvasm
index 054cbe8..ea9de67 100644
--- a/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.spvasm
index 3b7567c..ffd47ad 100644
--- a/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.spvasm
index b9a4858..b0a55cc 100644
--- a/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.spvasm
index 02602ae..9828a8d 100644
--- a/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.spvasm
index 7d3a164..0745710 100644
--- a/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.spvasm
index ad88a12..5fddb23 100644
--- a/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.spvasm
index 742a157..a88036a 100644
--- a/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.spvasm
index d2d335e..7680de4 100644
--- a/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.spvasm
index 4d94932..1089a13 100644
--- a/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.spvasm
index 6d09728..aa08cb6 100644
--- a/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.spvasm
index 1288c8b..37a8014 100644
--- a/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.spvasm
index c160cde..ccf983c 100644
--- a/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.spvasm
index 87dbede..bc37a95 100644
--- a/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.spvasm
index 0f1d0dc..38f62bc 100644
--- a/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.spvasm
index 17f2a1c..9b634cd 100644
--- a/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.spvasm
index 5bfd099..88b3ee4 100644
--- a/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.spvasm
index 3908ea0..674738a 100644
--- a/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.spvasm
index df9d3f0..93a6907 100644
--- a/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.spvasm
index 6fb22fb..acd9569 100644
--- a/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.spvasm
index da015d3..29057c1 100644
--- a/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.spvasm
index 07b5d9c..ba3ada8 100644
--- a/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.spvasm
index dc8b7ff..b9ac4c1 100644
--- a/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.spvasm
index 892d31e..f28027c 100644
--- a/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.spvasm
index 6197b26..6ec8d79 100644
--- a/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.spvasm
index f2a2b6f..0c4974f 100644
--- a/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.spvasm
index b61a157..7fe3aef 100644
--- a/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.spvasm
index 8e55b59..0ae0b4e 100644
--- a/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.spvasm
index 6ed0cfd..c9d7ff0 100644
--- a/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.spvasm
index 6c0fe17..4d2d3d9 100644
--- a/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.spvasm
index 75e1452..4ef3044 100644
--- a/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.spvasm
index 03857f5..461ec90 100644
--- a/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.spvasm
index e914d3f..0c84a69 100644
--- a/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.spvasm
index e7d3baa..1d79b68 100644
--- a/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.spvasm
index ca419dc..5bbaafb 100644
--- a/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.spvasm
index dd31b89..e1604b2 100644
--- a/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.spvasm
index f27186d..c8bba62 100644
--- a/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.spvasm
index 8341d24..630c26b 100644
--- a/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.spvasm
index 5657029..33db68a 100644
--- a/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.spvasm
index 0d2ce51..2460666 100644
--- a/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.spvasm
index 02aa3a8..9335fa1 100644
--- a/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.spvasm
index 6563c71..ca3d896 100644
--- a/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.spvasm
index 59d5bfe..aac0834 100644
--- a/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.spvasm
index a511519..88f48c6 100644
--- a/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.spvasm
index 97f3c27..3197766 100644
--- a/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.spvasm
index 3c14b6d..2225044 100644
--- a/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.spvasm
index efb21cc..604fad6 100644
--- a/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.spvasm
index f618ae8..3d4c1c2 100644
--- a/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.spvasm
index 84c31dc..73f3c17 100644
--- a/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.spvasm
index c58b7d9..1a71dfa 100644
--- a/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.spvasm
index b58c945..100280d 100644
--- a/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.spvasm
index 01431e5..e4e427d 100644
--- a/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
index b37b678..6a8b5d5 100644
--- a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
@@ -28,8 +28,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
       %SB_RW = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW
@@ -97,8 +95,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
       %SB_RW = OpTypeStruct %int
 %sb_rw_block = OpTypeStruct %SB_RW
diff --git a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
index a7cc1fc..a30d399 100644
--- a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
@@ -28,8 +28,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
       %SB_RW = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW
@@ -95,8 +93,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
       %SB_RW = OpTypeStruct %uint
 %sb_rw_block = OpTypeStruct %SB_RW
diff --git a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
index c060c9c..d22b55f 100644
--- a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
@@ -20,8 +20,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_u32 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Workgroup_uint = OpTypePointer Workgroup %uint
       %arg_0 = OpVariable %_ptr_Workgroup_uint Workgroup
diff --git a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
index 1c03b7c..cf682ba 100644
--- a/test/tint/builtins/gen/var/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
@@ -20,8 +20,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
 %_ptr_Workgroup_int = OpTypePointer Workgroup %int
       %arg_0 = OpVariable %_ptr_Workgroup_int Workgroup
diff --git a/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.spvasm
index d54f66c..33ddf9b 100644
--- a/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.spvasm
index c990bed..fc9cac6 100644
--- a/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.spvasm
index 0a05824..5401ed1 100644
--- a/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.spvasm
index bc202b3..58b044e 100644
--- a/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.spvasm
index 4a230cf..28a4295 100644
--- a/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.spvasm
index 460b9e8..0d93091 100644
--- a/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.spvasm
index 80e01fa..036ea20 100644
--- a/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.spvasm
index 97f824e..f64b44f 100644
--- a/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.spvasm
index c584a04..6c0f132 100644
--- a/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.spvasm
index 9318801..ce26a3cb 100644
--- a/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.spvasm
index fcaf072..87971aa 100644
--- a/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.spvasm
index 102df59..f2113dd 100644
--- a/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.spvasm
index 3bc4524..e68b8ca 100644
--- a/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.spvasm
@@ -127,8 +127,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.spvasm
index 065e968..87b952b 100644
--- a/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.spvasm
index aada3c7..8372186 100644
--- a/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.spvasm
index 7d6fc06..095a616 100644
--- a/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.spvasm
index 4af50a6..8994189 100644
--- a/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.spvasm
index 5794f70..d1ea605 100644
--- a/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.spvasm
index 3440727..4399320 100644
--- a/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.spvasm
index fb06e81..5c75e0c 100644
--- a/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.spvasm
index a0dfe09..5bc2d04 100644
--- a/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.spvasm
index b707089..1e50eda 100644
--- a/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.spvasm
index 3c3ea48..0a0ecef 100644
--- a/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.spvasm
index 06847d0..ee16c9b 100644
--- a/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.spvasm
index 0a7743b..19e1b0b 100644
--- a/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.spvasm
index bf28b69..c6ad75e 100644
--- a/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.spvasm
index a30c4ce9..a84ef53 100644
--- a/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.spvasm
index 25a90fb..4969926 100644
--- a/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.spvasm
index ed9f870..bce802f 100644
--- a/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.spvasm
@@ -129,8 +129,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.spvasm
index 7a7388e..3c0a0e0 100644
--- a/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.spvasm
index 54c81b5..9b551f1 100644
--- a/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.spvasm
index 7361f4e..d8300b5 100644
--- a/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.spvasm
index 6aef401..3b000d6 100644
--- a/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.spvasm
@@ -118,8 +118,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.spvasm
index ba5944c..db3abf8 100644
--- a/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.spvasm
index 1856764..ce9778f 100644
--- a/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.spvasm
index 7de57c2..b6418c0 100644
--- a/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.spvasm
index 39ec96c..14e3172 100644
--- a/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.spvasm
index 8796d2d..042d936 100644
--- a/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.spvasm
index a6f6826..f2cb753 100644
--- a/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.spvasm
index f1eca62..843ec60 100644
--- a/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.spvasm
index 746789e..ca01bcc 100644
--- a/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.spvasm
index 731f6e6..4020c55 100644
--- a/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.spvasm
index 485ed53..1ceba49 100644
--- a/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.spvasm
index 9671467..85e1153 100644
--- a/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.spvasm
@@ -129,8 +129,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.spvasm
index cfb5fab..b85677e 100644
--- a/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.spvasm
index c57834e..7885e1b 100644
--- a/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.spvasm
index 2d0406e..adbb4b6 100644
--- a/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.spvasm
index ef1668e..589bb06 100644
--- a/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.spvasm
index 7e98dc7..299c6c3 100644
--- a/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.spvasm
@@ -139,8 +139,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.spvasm
index 2bc2abd..0b12ab6 100644
--- a/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.spvasm
index 4466619..5e1b22b 100644
--- a/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.spvasm
index 8ee0888..f731576 100644
--- a/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.spvasm
index 8caea57..e3f5a93 100644
--- a/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.spvasm
index e402a2f..b3ecd23 100644
--- a/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.spvasm
index 1bc2e5f..d057d87 100644
--- a/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.spvasm
index 0fc000d..7dfdf68 100644
--- a/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.spvasm
@@ -122,8 +122,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.spvasm
index 652eeec..3e662e7 100644
--- a/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.spvasm
index d8850cc..7035d33 100644
--- a/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.spvasm
index d1e50ba..0432b16 100644
--- a/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.spvasm
index c08694e..28d5be1 100644
--- a/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.spvasm
index c05391f..dd2fd0c 100644
--- a/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.spvasm
index 7280a68..13c565c 100644
--- a/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.spvasm
index 0fb0830..89aa470 100644
--- a/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.spvasm
index 98ba548..a3424e5 100644
--- a/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.spvasm
index 3b79215..ff4be5f 100644
--- a/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.spvasm
index a2bcf4a..ef637ca 100644
--- a/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.spvasm
index d0a323f..76d70c6 100644
--- a/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.spvasm
index 76b04b5..113d41a 100644
--- a/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.spvasm
index e1d8d32..1b7735c 100644
--- a/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.spvasm
index 8631d6c..b17da68 100644
--- a/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.spvasm
index f4e13992..74b05a6 100644
--- a/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.spvasm
index 14e9435..62e9898 100644
--- a/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.spvasm
index e114efe..a6493fd 100644
--- a/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.spvasm
index f6c9857..fbc1d09 100644
--- a/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.spvasm
index 9d6bb91..9b4833a 100644
--- a/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.spvasm
index 5259ec1..09a34be 100644
--- a/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.spvasm
index 0c4190c..fd9ff13 100644
--- a/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.spvasm
index 710e9fc..e23f4e1 100644
--- a/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.spvasm
index 7bf7b3b..d4747fd 100644
--- a/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.spvasm
index 29d59b0..9f71c12 100644
--- a/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.spvasm
index 6a9b6c0..a3debfe 100644
--- a/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.spvasm
index badc32e..05a9481 100644
--- a/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.spvasm
index 00d205a..3969e78 100644
--- a/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.spvasm
index 531a276..07d8566 100644
--- a/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.spvasm
index bd72fe6..1cdb25b 100644
--- a/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.spvasm
index 0e373a3..5b6a186 100644
--- a/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.spvasm
index 2974a88..1d78b6b 100644
--- a/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.spvasm
index ad162ef..19f28ab 100644
--- a/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.spvasm
index 93b5cf8..f277aa9 100644
--- a/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.spvasm
index a3aea71..9aef1c7 100644
--- a/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.spvasm
index a273254..57b66d1 100644
--- a/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.spvasm b/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.spvasm
index 922e485..3155024 100644
--- a/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.spvasm
index c2676ea..cdcb2ee 100644
--- a/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.spvasm
index ef79782..3b28426 100644
--- a/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.spvasm
index 2466d2b..20907b4 100644
--- a/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.spvasm
index 3d27a60..691a1fb 100644
--- a/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.spvasm
index 0b849e6..41dd30e 100644
--- a/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.spvasm
index 5cbf9dd..4c4ba5d 100644
--- a/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.spvasm
index 7316925..d2ff8a5 100644
--- a/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.spvasm
index 5025495..201eaf2 100644
--- a/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.spvasm
index d566113..2e0c1af 100644
--- a/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.spvasm
index 2172c66..70c7ab8 100644
--- a/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.spvasm
index c890d21..a537cfa 100644
--- a/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.spvasm
index 2baec13..c86acec 100644
--- a/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.spvasm
index 911ebcf..45db285 100644
--- a/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.spvasm
index 7a5f54ed..723955f 100644
--- a/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.spvasm
index a0faf97..8ec4238 100644
--- a/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.spvasm
index a367b59..b5cb5ee 100644
--- a/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.spvasm
index d1db43d..6f68652 100644
--- a/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.spvasm
index 4c0bd7b..3ee5dfe 100644
--- a/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.spvasm
index db572f0..2899e0b 100644
--- a/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.spvasm
index 22e5eb5..1e4a416 100644
--- a/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.spvasm
index ff62b5e..474d061 100644
--- a/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.spvasm
index 58d9a84..62104c2 100644
--- a/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.spvasm
index ee38b36..6ab792c 100644
--- a/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.spvasm
@@ -136,8 +136,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.spvasm
index b17be94..327b8aa 100644
--- a/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.spvasm
index 8e4efd5..f1c03d2 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.spvasm
index 70733d9..7dcb382 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.spvasm
index 8e089bd..8172ad0 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.spvasm
@@ -217,8 +217,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.spvasm
index 71f5bed..e591084 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.spvasm
@@ -229,8 +229,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.spvasm
index 5662fa7..cfe3371 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.spvasm
@@ -229,8 +229,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.spvasm
index 95925ad..302d486 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.spvasm
@@ -217,8 +217,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.spvasm
index 6c19bae..4cf7c68 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.spvasm
@@ -229,8 +229,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.spvasm
index 17718c6..ff38f33 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.spvasm
@@ -217,8 +217,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.spvasm
index fbe0746..094c97e 100644
--- a/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.spvasm
index c0dc5d0..d9a4c39 100644
--- a/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.spvasm
index 7591b58..eaa96a9 100644
--- a/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.spvasm
index 3211171..b011a19 100644
--- a/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.spvasm
index aeccfec..e92a551 100644
--- a/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.spvasm
index 9659258..62b78e7 100644
--- a/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.spvasm
@@ -129,8 +129,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.spvasm
index befcf8e..0937f13 100644
--- a/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.spvasm
index 6cda19b..20cbb57 100644
--- a/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.spvasm
index 0b31b7b..4c93c16 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.spvasm
@@ -221,8 +221,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.spvasm
index 13da58b..d1e8c8d 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.spvasm
@@ -233,8 +233,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.spvasm
index 3444d15..c5bd06d 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.spvasm
index 57c9391..fce267a 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.spvasm
@@ -233,8 +233,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.spvasm
index 0b9fa04..ef852ff 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.spvasm
@@ -205,8 +205,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.spvasm
index 6cb85cc..1a68cd5 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.spvasm
@@ -221,8 +221,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.spvasm
index e904eab..a976ce4 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.spvasm
@@ -233,8 +233,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
index 0871a6f..44f042f 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
@@ -221,8 +221,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.spvasm
index 11ed7fa..74de0fa 100644
--- a/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.spvasm
index 0f1346b..db9c258 100644
--- a/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.spvasm
index d4018c7..f1206fb 100644
--- a/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.spvasm
index 6676957..531ac35 100644
--- a/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.spvasm
index 10acb56..d6c0f95 100644
--- a/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.spvasm
index 8345eb2..22c38c8 100644
--- a/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.spvasm
index b3d09f8..5350194 100644
--- a/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.spvasm
index ba9628a..415aa28 100644
--- a/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.spvasm
index bd9ca8b..04719fd 100644
--- a/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.spvasm
index 1f0aea4..44fc7a9 100644
--- a/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.spvasm
index a16a5d5..f0e0abf 100644
--- a/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.spvasm
index 17bf483..18ad037 100644
--- a/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.spvasm
index 066467f..e472e57 100644
--- a/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.spvasm
index 528d306..8368c39 100644
--- a/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.spvasm
index e39505f..92e9e16 100644
--- a/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.spvasm
index 8755495..a0497da 100644
--- a/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.spvasm
index f044c0f..0ee0f52 100644
--- a/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.spvasm
index 196d1b0..6349abc 100644
--- a/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.spvasm
index b400c9a..571e806 100644
--- a/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.spvasm
index 9496196..fa2c542 100644
--- a/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.spvasm
index 4a660a3..8417296 100644
--- a/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.spvasm
index 9cdcc5a..8cab81e 100644
--- a/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.spvasm
index 0f410b8..7a5e49b 100644
--- a/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.spvasm
index 9c3a889..551a90b 100644
--- a/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.spvasm
index c2f2443..9bfd7b1 100644
--- a/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.spvasm
index 4e6efe4..4631223 100644
--- a/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.spvasm
index 1eda31f..507045f 100644
--- a/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.spvasm
index 84dbd1a..c269a4a 100644
--- a/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.spvasm
index da7911e..c255074 100644
--- a/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.spvasm
index 9a52d60..b3d30ec 100644
--- a/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.spvasm
index 8dfeaf8..bd56c08 100644
--- a/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.spvasm
index cbbe504..ef2b8fd 100644
--- a/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.spvasm
index 9a08355..ddabc45 100644
--- a/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.spvasm
index 75f34d5..8811438 100644
--- a/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.spvasm
index dfef323..ea71598 100644
--- a/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.spvasm
index b8874c5..472d9c8 100644
--- a/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.spvasm
index 7119a33..6e5cbc0 100644
--- a/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.spvasm
index c0c1488..5df432b 100644
--- a/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.spvasm
index 368d866..1e7ee97 100644
--- a/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.spvasm
index 5c7b5c9..2156181 100644
--- a/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.spvasm
index a442154..fa7eb4d 100644
--- a/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.spvasm
index 870d702..2a24f1f 100644
--- a/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.spvasm
index 949c07c..027e509 100644
--- a/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.spvasm
index 112b944..44f66d4 100644
--- a/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.spvasm
index 8762858..921671d 100644
--- a/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.spvasm
index 23874c0..fd7fce1 100644
--- a/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.spvasm
index b8e5414..8327d71 100644
--- a/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.spvasm
index 75e5136..f8f753b 100644
--- a/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.spvasm
index 6c15a05..c34313f 100644
--- a/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.spvasm
index d3c6a0a..a1f655b 100644
--- a/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.spvasm
index 36ab967..46c4c06 100644
--- a/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.spvasm
index 921adde..45f57be 100644
--- a/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.spvasm
index 0f9d836..9d4e4f3 100644
--- a/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.spvasm
index d9c919d..cec9f24 100644
--- a/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.spvasm
index c764869..bcff586 100644
--- a/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.spvasm
index b59aecc..052e673 100644
--- a/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.spvasm
index 15ecedf..981e830 100644
--- a/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.spvasm
index 4a86449..5d72596 100644
--- a/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.spvasm
index 3f1c1a4..64ecedf 100644
--- a/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.spvasm
index cb4e5a0..ac512a4 100644
--- a/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.spvasm
index d68d21b..34bd00e 100644
--- a/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.spvasm
index 307e1d1..94fd1da 100644
--- a/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/699629.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/699629.wgsl.expected.spvasm
index 4cdae34..4c0ca29 100644
--- a/test/tint/builtins/gen/var/exp/699629.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/699629.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.spvasm
index ca745f3..b8de172 100644
--- a/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.spvasm
index 37a9a43..879d16c 100644
--- a/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.spvasm
index 67f9215..ab99f6c 100644
--- a/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.spvasm
index 54f2578..70777f8 100644
--- a/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.spvasm
index d273a81..ab54873 100644
--- a/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.spvasm
index f9c3d5b..250bebf 100644
--- a/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.spvasm
index 06296b4..18a07fc 100644
--- a/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.spvasm
index 3b32c36..ab90537 100644
--- a/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.spvasm
index 26750ff..32dddca 100644
--- a/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.spvasm
index 42eb87b..e9e3a8c 100644
--- a/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.spvasm
index b40bcd9..f3e741f 100644
--- a/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.spvasm
index 404b8c5..56fbc98 100644
--- a/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.spvasm
index 645a521..3d71bed 100644
--- a/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.spvasm
index aca8485..d4c17c3 100644
--- a/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.spvasm
index 42a1cb1..5e0b2b6 100644
--- a/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.spvasm
index 2aa8614..c341f62 100644
--- a/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.spvasm b/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.spvasm
index e5cab5d..7ed1c01 100644
--- a/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.spvasm
index 96d2d82..84103b7 100644
--- a/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.spvasm
index f87146e..8f87d6a 100644
--- a/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.spvasm
index 0c23fd1..38ab495 100644
--- a/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.spvasm
index 19972f2..555ef85 100644
--- a/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.spvasm
index b9e80f4..907e393 100644
--- a/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.spvasm
index 6b33eb6..328c59e 100644
--- a/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.spvasm
index 77453ce..0287d34 100644
--- a/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.spvasm
index 37c06b0..88f1768 100644
--- a/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.spvasm
index bc94d4d..5c566fa 100644
--- a/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.spvasm
index 1dfeef9..c0bbcd2 100644
--- a/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.spvasm
index 814ca6a..f1f6a36 100644
--- a/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.spvasm
index 36fb6d3..3f80c72 100644
--- a/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.spvasm
index e237bb6..a43a964 100644
--- a/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.spvasm
index efe1d72..cc76d17 100644
--- a/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.spvasm
index a94f889..b4aac3a 100644
--- a/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.spvasm
index b693079..98b8e14 100644
--- a/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.spvasm
index bc3a609..5dd6987 100644
--- a/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.spvasm
index bc21bf7..ff0c6a8 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.spvasm
index 65a5b35..da8b096 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.spvasm
@@ -245,8 +245,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
index 9a3eabb..3bd06fb 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.spvasm
index 4fd71f6..90d048d 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.spvasm
@@ -213,8 +213,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.spvasm
index 6d78a11..fc0b617 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.spvasm
index 61fb61d..5633a9e 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.spvasm
@@ -245,8 +245,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.spvasm
index 95e12e5..454cdfb 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.spvasm
@@ -245,8 +245,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.spvasm
index 1786349..65fecf9 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.spvasm
index 9b080f64..44e9182 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.spvasm
index 491a3fc..cd540e6 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.spvasm
@@ -205,8 +205,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.spvasm
index a3f8bbf..0a2b778 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.spvasm
index 77ce599..adbec35 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.spvasm
index 8f78578..882cf55 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.spvasm
@@ -235,8 +235,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.spvasm
index 917ad3a..8f8c03a 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.spvasm
@@ -235,8 +235,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.spvasm
index 7e8ab27..0475b17 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.spvasm
@@ -235,8 +235,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.spvasm
index a00157b..1c8df29 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.spvasm
@@ -223,8 +223,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/218952.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/218952.wgsl.expected.spvasm
index 212d0e3..bf77c4d 100644
--- a/test/tint/builtins/gen/var/floor/218952.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/218952.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.spvasm
index 06d0331..5e88a3b 100644
--- a/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.spvasm
index 3072e05..4a8a57a 100644
--- a/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.spvasm
index 3953f5f..6ec29ad 100644
--- a/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.spvasm
index 039cbae..c4d53a1 100644
--- a/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.spvasm
index 918ab66..9500fa9e4 100644
--- a/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.spvasm
index e7678d6..5cc782c 100644
--- a/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/953774.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/953774.wgsl.expected.spvasm
index 89cf86f..e74cebe 100644
--- a/test/tint/builtins/gen/var/floor/953774.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/953774.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.spvasm
index 767cf0d..3a205f0 100644
--- a/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.spvasm
index 7b18edc..9f8429f 100644
--- a/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.spvasm
index 614b10c..e5dd8a0 100644
--- a/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.spvasm b/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.spvasm
index d6a32c8..1dd18b1 100644
--- a/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.spvasm
index cdcf2b1..68a4932 100644
--- a/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.spvasm
index e1109e7..589f18f 100644
--- a/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.spvasm
index a05b6a2..2175fb8 100644
--- a/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/466442.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/466442.wgsl.expected.spvasm
index b0cb9f9..ba718b7 100644
--- a/test/tint/builtins/gen/var/fma/466442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/466442.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.spvasm
index 577c6dc..aff1dd8 100644
--- a/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.spvasm
index 33fa9ef..d5e451a 100644
--- a/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.spvasm
index 8106d34..dff0a30 100644
--- a/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.spvasm
index 5fe4b94..cfa2b3b 100644
--- a/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.spvasm
index 65d254a..8ca405e 100644
--- a/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.spvasm
index f80c022..3978665 100644
--- a/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.spvasm
index a8e798d..f554626 100644
--- a/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.spvasm
index a38e7a1..59d2821 100644
--- a/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.spvasm
index 463354f..7fc432c 100644
--- a/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.spvasm
index 03dba36..9305b00 100644
--- a/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.spvasm
index 445f63f..58b7350 100644
--- a/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.spvasm
index 0f8cfb5..3079f75 100644
--- a/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.spvasm
index 8fe5280..514cbb5 100644
--- a/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.spvasm
index f5149e7..c414d8a 100644
--- a/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.spvasm
index 288a653..b524cdb 100644
--- a/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.spvasm
index a1c79bb..06b6159 100644
--- a/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.spvasm
index 1f05c64..5836e74 100644
--- a/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.spvasm
index 5c98b34..a23dbc5 100644
--- a/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.spvasm
index 9ea7493..5d61602 100644
--- a/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.spvasm b/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.spvasm
index 2d0b475..3f0085d 100644
--- a/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.spvasm
index 4f203fa..39f82e2 100644
--- a/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.spvasm
index f31af4f..753cfda 100644
--- a/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__frexp_result_vec4_f16 "__frexp_result_vec4_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -72,8 +70,6 @@
                OpName %__frexp_result_vec4_f16 "__frexp_result_vec4_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -130,9 +126,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f16 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
index 6db3fdf..25dc2b1 100644
--- a/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -63,8 +61,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -115,9 +111,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.spvasm
index 941ae51..a58a264 100644
--- a/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__frexp_result_f16 "__frexp_result_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -69,8 +67,6 @@
                OpName %__frexp_result_f16 "__frexp_result_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -124,9 +120,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_f16 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.spvasm
index f8862a1..1faa6b1 100644
--- a/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__frexp_result_vec2_f16 "__frexp_result_vec2_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -72,8 +70,6 @@
                OpName %__frexp_result_vec2_f16 "__frexp_result_vec2_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -130,9 +126,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.spvasm
index 3f0bbab..d9d3250 100644
--- a/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
index ec5c75b..5ccdef3 100644
--- a/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec4_f32 "__frexp_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -121,9 +117,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
index d6f91a8..b72ae9f 100644
--- a/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -121,9 +117,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.spvasm
index be7f959..3945967 100644
--- a/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__frexp_result_vec3_f16 "__frexp_result_vec3_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -72,8 +70,6 @@
                OpName %__frexp_result_vec3_f16 "__frexp_result_vec3_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -130,9 +126,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f16 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.spvasm
index 10b50b0..4b7b71a 100644
--- a/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -56,8 +54,6 @@
                OpName %__frexp_result_f32 "__frexp_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -103,9 +99,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.spvasm
index 97531fd..800b1cf 100644
--- a/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -60,8 +58,6 @@
                OpName %__frexp_result_vec3_f32 "__frexp_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -111,9 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
index 1551ba9..20dbc88 100644
--- a/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -66,8 +64,6 @@
                OpName %__frexp_result_vec2_f32 "__frexp_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -121,9 +117,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__frexp_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.spvasm
index 1288790..a75a880 100644
--- a/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.spvasm
index d7239e7..fe2e964 100644
--- a/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.spvasm
index e91d6f2..de4a1bd5 100644
--- a/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.spvasm
index f5a0b69..83bad0c 100644
--- a/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.spvasm
index bafdf66..7d03ed9 100644
--- a/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.spvasm
index 69b67d2..6c5a72f 100644
--- a/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.spvasm
index 8e5976c..3d17c30 100644
--- a/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.spvasm
index 3f2c50f..1882d42 100644
--- a/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.spvasm
index f53d2bc..92ebdf3 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.spvasm
index c60eb8e..ff7d0e8 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.spvasm
index d3d3bf4..4d120a8 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.spvasm
index dfe4055..cd19b80 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.spvasm
index 13c1e9f..fabba32 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.spvasm
index 801c2d1..a8c8888 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.spvasm
index fdaa402..989b3d3 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.spvasm
index cfc29f3..3672efc 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.spvasm
index e7a4c71..160aa74 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.spvasm
index fb01028..c2fb294 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.spvasm
index 7bffebb..8380255 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.spvasm
index be8aea8..0468060 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.spvasm
index acf9322..5db342b 100644
--- a/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.spvasm
index d3b02e0..38b9558 100644
--- a/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.spvasm
index f98d1a8..57c5b9b 100644
--- a/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.spvasm
@@ -110,7 +110,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.spvasm
index d61399c..248c129 100644
--- a/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.spvasm
index 5a0ae22..768d7c5 100644
--- a/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.spvasm
@@ -110,7 +110,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.spvasm
index ea8fc8c..cfc999a 100644
--- a/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.spvasm
index 4e310a5..fd6f270 100644
--- a/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.spvasm
index 824af44..b62d29b 100644
--- a/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.spvasm
index daadfcf..f5401bd 100644
--- a/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.spvasm
@@ -159,8 +159,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.spvasm
index d58654b..6abe0c2 100644
--- a/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.spvasm
index ca2918e..34cd926 100644
--- a/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.spvasm
@@ -102,7 +102,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.spvasm
index b968cb8..3ccd6e7 100644
--- a/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.spvasm
index 8132e65..fc72cad 100644
--- a/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.spvasm
index fa8c56c..af547a1 100644
--- a/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.spvasm
index 2eaee34..4143cd6 100644
--- a/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.spvasm
index c12d5c1..ac28cc3 100644
--- a/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.spvasm
index 3f66308..1cd6e44 100644
--- a/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.spvasm
index 5918135..7959f30 100644
--- a/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.spvasm
@@ -110,7 +110,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.spvasm
index 0c650b7..9f4cc6f 100644
--- a/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.spvasm
index 22eba62..660890e 100644
--- a/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.spvasm
index cbfacbc..a4644c8 100644
--- a/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.spvasm
index 4a88580..942f0d5 100644
--- a/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.spvasm
index 986192e..e5a9259 100644
--- a/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.spvasm
index d7ee3d6d..f496507 100644
--- a/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/056071.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/056071.wgsl.expected.spvasm
index 26ce4aa..34c312f 100644
--- a/test/tint/builtins/gen/var/length/056071.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/056071.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.spvasm
index 785af5b..8ed3a02 100644
--- a/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/555aba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/555aba.wgsl.expected.spvasm
index 61cf375..5085328 100644
--- a/test/tint/builtins/gen/var/length/555aba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/555aba.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.spvasm
index a3df862..096a094 100644
--- a/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/602a17.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/602a17.wgsl.expected.spvasm
index 373780e..c079602 100644
--- a/test/tint/builtins/gen/var/length/602a17.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/602a17.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.spvasm
index 254b0bf..5f365a6 100644
--- a/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.spvasm
index dbbb85e..6fd9c44 100644
--- a/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.spvasm
index eb5e5ff..0d1f6e5 100644
--- a/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.spvasm
index c79c0b8..af03e1b 100644
--- a/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/becebf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/becebf.wgsl.expected.spvasm
index 9496978..014b619 100644
--- a/test/tint/builtins/gen/var/length/becebf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/becebf.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/c158da.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/c158da.wgsl.expected.spvasm
index f9760ab..6a68d9b 100644
--- a/test/tint/builtins/gen/var/length/c158da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/c158da.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.spvasm b/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.spvasm
index d40909e..e870671 100644
--- a/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.spvasm
index c2d18af..c12f238 100644
--- a/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/655989.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/655989.wgsl.expected.spvasm
index 90b3731..25209b9 100644
--- a/test/tint/builtins/gen/var/log/655989.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/655989.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.spvasm
index 10d85f3..7f4e406 100644
--- a/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.spvasm
index 1a5fa0a..94d4c11 100644
--- a/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.spvasm
index 6b7deb0..93aef6a 100644
--- a/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.spvasm
index 8866314..2c87064 100644
--- a/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.spvasm
index 903ab78..6de71a4 100644
--- a/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.spvasm
index e1237b9..5339064 100644
--- a/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.spvasm
index 7667a75..3ee61b6 100644
--- a/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.spvasm
index 31e892b..7a48fba 100644
--- a/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.spvasm
index e558a51..6d6ef12 100644
--- a/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.spvasm
index 14cf298..bee07ce 100644
--- a/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.spvasm
index 8ba3f41..bd74cea 100644
--- a/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.spvasm
index 80c5759..d65343e 100644
--- a/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.spvasm
index 893d57d..46609a1 100644
--- a/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.spvasm
index eddddb5..c9bd5ea 100644
--- a/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.spvasm
index 350f766..e3706fd 100644
--- a/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/776088.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/776088.wgsl.expected.spvasm
index aad7043..073bd56 100644
--- a/test/tint/builtins/gen/var/log2/776088.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/776088.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.spvasm
index 3bb9527..fe564e5 100644
--- a/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/902988.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/902988.wgsl.expected.spvasm
index 65548df..2b17463 100644
--- a/test/tint/builtins/gen/var/log2/902988.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/902988.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.spvasm
index 7ffd572..856bb86 100644
--- a/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.spvasm
@@ -84,7 +84,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.spvasm
index c38a9e2..0b286af 100644
--- a/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.spvasm
index bc72c18..167d601 100644
--- a/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.spvasm
index 9b503c0..e0d77d0 100644
--- a/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.spvasm
index 9acc33f..0e5542b 100644
--- a/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.spvasm
index c8795bc..085d57f 100644
--- a/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.spvasm
index 9f545c6..bc5f362 100644
--- a/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/19070a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/19070a.wgsl.expected.spvasm
index 108027d..b4ee791 100644
--- a/test/tint/builtins/gen/var/max/19070a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/19070a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.spvasm
index 4c0690e..6bae3d8 100644
--- a/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/320815.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/320815.wgsl.expected.spvasm
index 497e4fb..8094c08 100644
--- a/test/tint/builtins/gen/var/max/320815.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/320815.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/34956e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/34956e.wgsl.expected.spvasm
index fbe5d61..89c3e421 100644
--- a/test/tint/builtins/gen/var/max/34956e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/34956e.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/445169.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/445169.wgsl.expected.spvasm
index 55d8be7..c74931e 100644
--- a/test/tint/builtins/gen/var/max/445169.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/445169.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.spvasm
index c72d6a5..722acb3 100644
--- a/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/453e04.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/453e04.wgsl.expected.spvasm
index b82a889..8be4abb 100644
--- a/test/tint/builtins/gen/var/max/453e04.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/453e04.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/462050.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/462050.wgsl.expected.spvasm
index 08e6ad3..d864bc1 100644
--- a/test/tint/builtins/gen/var/max/462050.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/462050.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/482d23.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/482d23.wgsl.expected.spvasm
index 0665aa0..f82543e 100644
--- a/test/tint/builtins/gen/var/max/482d23.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/482d23.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.spvasm
index 7edb917..ad3d49b 100644
--- a/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.spvasm
index 029b515..9fb7358 100644
--- a/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.spvasm
index 3b388dc..2cd487b 100644
--- a/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.spvasm
index 37aaee3..5cd394e 100644
--- a/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/a93419.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/a93419.wgsl.expected.spvasm
index ee088d1..030f3da 100644
--- a/test/tint/builtins/gen/var/max/a93419.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/a93419.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.spvasm
index 35ed28d..f4baf70 100644
--- a/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.spvasm
index 20fb9dc..7e11488 100644
--- a/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.spvasm
index 955ca48..857ac70 100644
--- a/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.spvasm
index b6b6328..1a61906 100644
--- a/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.spvasm
index ee10875..acd49a9 100644
--- a/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.spvasm
index 65b35ae..74df30b 100644
--- a/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.spvasm
index ad4ee08..ebc1203 100644
--- a/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.spvasm
index af141df..7e7334c 100644
--- a/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.spvasm
index e9a4676..874d6a7 100644
--- a/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/364910.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/364910.wgsl.expected.spvasm
index 949144e..712c1ca 100644
--- a/test/tint/builtins/gen/var/min/364910.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/364910.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.spvasm
index 033a881..f0aecf6 100644
--- a/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.spvasm
index 32dfce9..da484eb 100644
--- a/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.spvasm
index bcbe211..9835ee4 100644
--- a/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/527b79.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/527b79.wgsl.expected.spvasm
index 7a007b5..8066a06 100644
--- a/test/tint/builtins/gen/var/min/527b79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/527b79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/717257.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/717257.wgsl.expected.spvasm
index e906e50..64fcdda 100644
--- a/test/tint/builtins/gen/var/min/717257.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/717257.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/794711.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/794711.wgsl.expected.spvasm
index 1c44275..78e91ec 100644
--- a/test/tint/builtins/gen/var/min/794711.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/794711.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.spvasm
index c615e99..012446a 100644
--- a/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.spvasm
index 97224f6..ecf84df 100644
--- a/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.spvasm
index e9c9809..3eee456 100644
--- a/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.spvasm
index 9016f75..7ce165f 100644
--- a/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/98e797.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/98e797.wgsl.expected.spvasm
index 3b892f3..41f1291 100644
--- a/test/tint/builtins/gen/var/min/98e797.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/98e797.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/a45171.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/a45171.wgsl.expected.spvasm
index dc01aed..2815d76 100644
--- a/test/tint/builtins/gen/var/min/a45171.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/a45171.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.spvasm
index 9b6d595..deabe42 100644
--- a/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.spvasm
index dc7a30b..d17768a 100644
--- a/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.spvasm
index fb4c7a7..19e2da6 100644
--- a/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/af326d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/af326d.wgsl.expected.spvasm
index fb47f6c..3590d3d 100644
--- a/test/tint/builtins/gen/var/min/af326d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/af326d.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/af364e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/af364e.wgsl.expected.spvasm
index 53cd8be..7c25bf9 100644
--- a/test/tint/builtins/gen/var/min/af364e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/af364e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.spvasm
index 4c22765..eb84be5 100644
--- a/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/c73147.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/c73147.wgsl.expected.spvasm
index f963967..2088704 100644
--- a/test/tint/builtins/gen/var/min/c73147.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/c73147.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.spvasm
index a1f45e5..509663e 100644
--- a/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.spvasm
index 7cc2ab2..0fbdac9 100644
--- a/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.spvasm
index 4495d22..4a9a861 100644
--- a/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.spvasm
index 5b80e00..b9b7470 100644
--- a/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.spvasm
index 08815a0..7c41846 100644
--- a/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.spvasm
index 8f0942f..1719334 100644
--- a/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.spvasm
index aea3d25..79f67a5 100644
--- a/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/315264.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/315264.wgsl.expected.spvasm
index 24cb6c7..52fb5de 100644
--- a/test/tint/builtins/gen/var/mix/315264.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/315264.wgsl.expected.spvasm
@@ -160,8 +160,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.spvasm
index e1aa51c..5597eda 100644
--- a/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
index 2bab07f..227a126 100644
--- a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.spvasm
index 7718fb8..e0a2218 100644
--- a/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.spvasm
index 6ec1ef78..a91939d 100644
--- a/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.spvasm
index e2957e7..99b5d4c 100644
--- a/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.spvasm
index 7f63ea6..8667698 100644
--- a/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.spvasm
index fbcbbbd..18b37c7 100644
--- a/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.spvasm
index 833131b..d13b6f5 100644
--- a/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.spvasm
index 53126bf..2f548e5 100644
--- a/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.spvasm
index 0221b73..349cb68 100644
--- a/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.spvasm
index 4f3d572..7fadf88 100644
--- a/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.spvasm
@@ -156,8 +156,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.spvasm
index 8c4a837..fd3f93f 100644
--- a/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.spvasm
index b541e8b..0efd047 100644
--- a/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.spvasm
index d70259b..9c5d8fa 100644
--- a/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.spvasm b/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.spvasm
index 599e9b6..96c2268 100644
--- a/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
index 86819cf..58ae128a 100644
--- a/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -117,9 +113,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.spvasm
index 8ee1d7b..338bddf 100644
--- a/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__modf_result_vec3_f16 "__modf_result_vec3_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -70,8 +68,6 @@
                OpName %__modf_result_vec3_f16 "__modf_result_vec3_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -126,9 +122,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
index e70aedb..2a923dd 100644
--- a/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -117,9 +113,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
index ba6f805..371233f 100644
--- a/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -64,8 +62,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -117,9 +113,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.spvasm
index 5601013..c37d079 100644
--- a/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec3_f32 "__modf_result_vec3_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec3_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec3_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.spvasm
index d1f2ff7..c2c12c0 100644
--- a/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec2_f32 "__modf_result_vec2_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.spvasm
index dda0082..e18a5c9 100644
--- a/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__modf_result_f16 "__modf_result_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -68,8 +66,6 @@
                OpName %__modf_result_f16 "__modf_result_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -122,9 +118,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_f16 1 Offset 2
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/995934.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/995934.wgsl.expected.spvasm
index 1d2b523..b2a436d 100644
--- a/test/tint/builtins/gen/var/modf/995934.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/995934.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__modf_result_vec4_f16 "__modf_result_vec4_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -70,8 +68,6 @@
                OpName %__modf_result_vec4_f16 "__modf_result_vec4_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -126,9 +122,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f16 1 Offset 8
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.spvasm
index 9c8fe9c..4e2076b 100644
--- a/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpName %__modf_result_vec2_f16 "__modf_result_vec2_f16"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -70,8 +68,6 @@
                OpName %__modf_result_vec2_f16 "__modf_result_vec2_f16"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
@@ -126,9 +122,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec2_f16 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f16 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
index 081c342..f98e7e7 100644
--- a/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
@@ -18,8 +18,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -62,8 +60,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -113,9 +109,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.spvasm
index afad630..d45e620 100644
--- a/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -55,8 +53,6 @@
                OpName %__modf_result_f32 "__modf_result_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -101,9 +97,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.spvasm
index d0fb648..caa8a5f 100644
--- a/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -58,8 +56,6 @@
                OpName %__modf_result_vec4_f32 "__modf_result_vec4_f32"
                OpName %res "res"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
@@ -107,9 +103,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %__modf_result_vec4_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec4_f32 1 Offset 16
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.spvasm
index de39543..8aa054e 100644
--- a/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.spvasm
index e288d33..5803490 100644
--- a/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.spvasm
index 6f37d80..5347f90 100644
--- a/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.spvasm
index a2b701d..08cf06b 100644
--- a/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.spvasm
index 8327d65..278a465 100644
--- a/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.spvasm
index fc06d1e..f6521d4 100644
--- a/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.spvasm
index cf71c04..02b8171 100644
--- a/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.spvasm
index f08599b..6d12f64 100644
--- a/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.spvasm
index a89b7c6..a52aebd 100644
--- a/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.spvasm
index 14559d5..1c88410 100644
--- a/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.spvasm
index c49f874..4b9a13c 100644
--- a/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.spvasm
index 5cd9cfb..5590c03 100644
--- a/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.spvasm
index 5790588..d7cd446 100644
--- a/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.spvasm
index e7cf049..6bf97cd 100644
--- a/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.spvasm
index d951845..38e6bf3 100644
--- a/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
index 1cc0fdf..ce4265f 100644
--- a/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.spvasm
index a32594a..c77b40e 100644
--- a/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
index 85442e2..3ed5c15 100644
--- a/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.spvasm
index b7a5e4e..ce422ef 100644
--- a/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.spvasm
index 9458eac..3486fe4 100644
--- a/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.spvasm
index 4d9f0a1..cb1544e 100644
--- a/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.spvasm
index cb15766..6cfc18b 100644
--- a/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.spvasm
index 5e82a94..36ee33e 100644
--- a/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.spvasm
index 4436da1..8f59a06 100644
--- a/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.spvasm
index a6bc64d..69bcb3b 100644
--- a/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.spvasm
index a6f88e0..efa0e1c 100644
--- a/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.spvasm
index 428ef35..d58a0a4 100644
--- a/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.spvasm
index a7655b4..05cfc4c 100644
--- a/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.spvasm
index 6c24eaf..7ce32a2 100644
--- a/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.spvasm b/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.spvasm
index 245aa50..329a4bb 100644
--- a/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.spvasm
index cd0fe08..987f443 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.spvasm
index 443268b..c8dcc2c 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.spvasm b/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.spvasm
index c2a6de5..bb030bc 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.spvasm
@@ -151,8 +151,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.spvasm b/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.spvasm
index c630f21..cb521fb 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.spvasm
index cca364d..393af23 100644
--- a/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.spvasm
index 6f3e7ef..18878dc 100644
--- a/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/379214.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/379214.wgsl.expected.spvasm
index 4b58a2d..b90ebfa 100644
--- a/test/tint/builtins/gen/var/radians/379214.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/379214.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.spvasm
index 7c55163..a4f43da 100644
--- a/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.spvasm
index 29540f5..efdf22b 100644
--- a/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.spvasm
index 4b8687f..747b627 100644
--- a/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.spvasm
index f7a1d9a..f05d083e 100644
--- a/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.spvasm
index 170b92b..f4e9503 100644
--- a/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.spvasm
index fa37fda..ddf768b 100644
--- a/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.spvasm
index 0cc4c1f..c6fdab0 100644
--- a/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.spvasm
index b0ec695..7a1b145 100644
--- a/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.spvasm
index ba7e6f2..054542c 100644
--- a/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.spvasm
index c7309ed..f5531e2 100644
--- a/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.spvasm
index b2a1222..cba4b5f 100644
--- a/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.spvasm
index 3f52d0f..aef92e9 100644
--- a/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.spvasm
index 299fec3..8a8f4bb 100644
--- a/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.spvasm
index d0a9bda..dfaaf8d 100644
--- a/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.spvasm
index e25dd22..4ef8837 100644
--- a/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.spvasm
index 123d553..f79bb66 100644
--- a/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.spvasm
index 040b5ea..05c7598b 100644
--- a/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.spvasm
index 9788103..7b634b8d 100644
--- a/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.spvasm
index d24fd6b..43e6a91 100644
--- a/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.spvasm
index b82a3b2..26655a4 100644
--- a/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.spvasm
index e9104e5..44d4bfa 100644
--- a/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.spvasm
index cab0502..281a28b 100644
--- a/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.spvasm
index 691ffe6..b985c60 100644
--- a/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.spvasm
index 575ff68..26d0227 100644
--- a/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.spvasm
index 24119c3..eaf5504 100644
--- a/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.spvasm
@@ -158,8 +158,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.spvasm
index a4dcd33..6c8063b6 100644
--- a/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.spvasm
index b714c35..3b4d071 100644
--- a/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.spvasm
index de61f2a..98b5d68 100644
--- a/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.spvasm
index c715bc4..fb29aca 100644
--- a/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.spvasm
index 1ec8747..20b12ae 100644
--- a/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.spvasm
index c4d45a6..495c4a9 100644
--- a/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.spvasm
@@ -131,8 +131,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.spvasm
index 92d50eb..c06f3fc 100644
--- a/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.spvasm
index 3e4fb50..7353e9d 100644
--- a/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.spvasm
@@ -135,8 +135,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.spvasm
index 3041600..94d765d 100644
--- a/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.spvasm
@@ -133,8 +133,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.spvasm
index 3830b69..1352853 100644
--- a/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.spvasm
@@ -129,8 +129,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.spvasm
index 21f1858..026d837 100644
--- a/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.spvasm
index 406dd76..5743090 100644
--- a/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.spvasm
index d86cd6a..2496df9 100644
--- a/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.spvasm
index 3fc22d5..78eb90d 100644
--- a/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.spvasm
index 05a6388..27d088b 100644
--- a/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.spvasm
index 63828af..bd59826 100644
--- a/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.spvasm
index bdded5f..4d824de 100644
--- a/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.spvasm
index 51c19ea..fe3deab 100644
--- a/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.spvasm
index dee1121..f861eb8 100644
--- a/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.spvasm
index d573121..dd3f957 100644
--- a/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.spvasm
index daeb52d..5d8feb1 100644
--- a/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.spvasm
index 95f8ccb..1c5afef 100644
--- a/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.spvasm
index 354da46..0e1ba39a 100644
--- a/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.spvasm
index 7150167..7ba0536 100644
--- a/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.spvasm
index 95a3d7f..0e2e62f 100644
--- a/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.spvasm
index 735dcff..e5dc50d 100644
--- a/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.spvasm
index 7bc8408..465eda6 100644
--- a/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.spvasm
index 3c0410c..9614fe6 100644
--- a/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.spvasm
index d627fb9..ad7d86d 100644
--- a/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.spvasm
index 237966e..fc7b650 100644
--- a/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.spvasm
index 1442283..3e38e58 100644
--- a/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.spvasm
index c73ea71..a0fb8df 100644
--- a/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.spvasm
@@ -154,8 +154,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.spvasm
index a5ff6cc..407bc8d 100644
--- a/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.spvasm b/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.spvasm
index 02d3cfe..c388300 100644
--- a/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/00b848.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/00b848.wgsl.expected.spvasm
index 6adc267..ebf0195 100644
--- a/test/tint/builtins/gen/var/select/00b848.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/00b848.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.spvasm
index a5e8762..a2c7fe2 100644
--- a/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.spvasm
index b286496..d2c2fe6 100644
--- a/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/089657.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/089657.wgsl.expected.spvasm
index 76921ef..eff7097 100644
--- a/test/tint/builtins/gen/var/select/089657.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/089657.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.spvasm
index 0d6e6e2..973cb47 100644
--- a/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.spvasm
@@ -165,8 +165,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/17441a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/17441a.wgsl.expected.spvasm
index 31d0a21..5a5436b 100644
--- a/test/tint/builtins/gen/var/select/17441a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/17441a.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.spvasm
index b84f002..e9c7f54 100644
--- a/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.spvasm
index 5ab4a72..9374365 100644
--- a/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.spvasm
index e03c257..3166309 100644
--- a/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/266aff.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/266aff.wgsl.expected.spvasm
index d89faa8..3a973c3 100644
--- a/test/tint/builtins/gen/var/select/266aff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/266aff.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.spvasm
index 00f729b..46b98e8 100644
--- a/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.spvasm
index d4eb59b..92dd294 100644
--- a/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.spvasm
index 395e7c5..d0387f5 100644
--- a/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.spvasm
index 0387564..686dca9 100644
--- a/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/416e14.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/416e14.wgsl.expected.spvasm
index a3e48f8..139124b 100644
--- a/test/tint/builtins/gen/var/select/416e14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/416e14.wgsl.expected.spvasm
@@ -155,8 +155,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.spvasm
index 7918c75..26dafd9 100644
--- a/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/43741e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/43741e.wgsl.expected.spvasm
index 006c72e..bb8d221 100644
--- a/test/tint/builtins/gen/var/select/43741e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/43741e.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/494051.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/494051.wgsl.expected.spvasm
index 3e14dad..86db02c 100644
--- a/test/tint/builtins/gen/var/select/494051.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/494051.wgsl.expected.spvasm
@@ -99,7 +99,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.spvasm
index abb79de..fe5e632 100644
--- a/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.spvasm
index 38bdf31..4f11ad0 100644
--- a/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/51b047.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/51b047.wgsl.expected.spvasm
index ca3e813..af50f56 100644
--- a/test/tint/builtins/gen/var/select/51b047.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/51b047.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/53d518.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/53d518.wgsl.expected.spvasm
index 8a3089b..2f69f1c 100644
--- a/test/tint/builtins/gen/var/select/53d518.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/53d518.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/713567.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/713567.wgsl.expected.spvasm
index a6ef302..21f37cf 100644
--- a/test/tint/builtins/gen/var/select/713567.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/713567.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.spvasm
index 9139011..7610858 100644
--- a/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.spvasm
index 2b23584..da74922 100644
--- a/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.spvasm
index 36f891a..b351fe7 100644
--- a/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.spvasm
index 4e09f2a..b89adb7 100644
--- a/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.spvasm
index dd44e08..3b1bcff 100644
--- a/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/99f883.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/99f883.wgsl.expected.spvasm
index d8b14b3..051aafd 100644
--- a/test/tint/builtins/gen/var/select/99f883.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/99f883.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.spvasm
index 9c37c7c..8410414 100644
--- a/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.spvasm
@@ -99,7 +99,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.spvasm
index 47df589..2369940 100644
--- a/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.spvasm
index 0cc0740..f31c79b 100644
--- a/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.spvasm
index 1bdb083..19bd4c20c 100644
--- a/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/b04721.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/b04721.wgsl.expected.spvasm
index 2024d3b..9dde17e 100644
--- a/test/tint/builtins/gen/var/select/b04721.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/b04721.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/b93806.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/b93806.wgsl.expected.spvasm
index 7166fc5..4cba2df 100644
--- a/test/tint/builtins/gen/var/select/b93806.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/b93806.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.spvasm
index a8e01f0..ac17c37 100644
--- a/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.spvasm
index 36a1218..9a74dbe 100644
--- a/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.spvasm
index e71bf53..1d93aa8 100644
--- a/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.spvasm
index e95ddd0e..f115620 100644
--- a/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.spvasm
index 2dc5d0f..76592e0 100644
--- a/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.spvasm
index 566ebfb..cb27e5d 100644
--- a/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.spvasm
index e0ab074..4910358 100644
--- a/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.spvasm
index b7ec2d4..28cb22f 100644
--- a/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.spvasm
index 9f1018f..19d7845 100644
--- a/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.spvasm
@@ -107,7 +107,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.spvasm
index 3ff5fac..3641efd 100644
--- a/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.spvasm
index 28498a1..86b3855 100644
--- a/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.spvasm
index a5cfaf5..cdfa927 100644
--- a/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.spvasm
index 3555abf..7bc1638 100644
--- a/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.spvasm
@@ -155,8 +155,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.spvasm b/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.spvasm
index e800480..ec7c4c5 100644
--- a/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.spvasm
index 3fe791b..d7b12d0 100644
--- a/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/159665.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/159665.wgsl.expected.spvasm
index d64dd9b..bd66423 100644
--- a/test/tint/builtins/gen/var/sign/159665.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/159665.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/160933.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/160933.wgsl.expected.spvasm
index faac45b..d456bf2 100644
--- a/test/tint/builtins/gen/var/sign/160933.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/160933.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.spvasm
index ac4cb58..2a25613 100644
--- a/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.spvasm
index 9a8a449..4cee7c6 100644
--- a/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.spvasm
index 387edcd..64279ea 100644
--- a/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.spvasm
index 245462c..641183e 100644
--- a/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.spvasm
index 7d61a844..969d196 100644
--- a/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.spvasm
index f67198a..6932856 100644
--- a/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.spvasm
index c5d5002..f9394a7 100644
--- a/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/926015.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/926015.wgsl.expected.spvasm
index 34e5257..a343ccc 100644
--- a/test/tint/builtins/gen/var/sign/926015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/926015.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.spvasm
index a1c3055..d388830 100644
--- a/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.spvasm
index feada17..9dac0f2 100644
--- a/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.spvasm
index a9a1e92..7f67d27 100644
--- a/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.spvasm
index 638a428..2c867ff 100644
--- a/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.spvasm
index 5e0a261..da8e2a5 100644
--- a/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.spvasm
index d20f037..2bb428a 100644
--- a/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.spvasm
index 9934d61..1da7e56 100644
--- a/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.spvasm
index 4be690f..123ca31 100644
--- a/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.spvasm
index c7c80cc..22413ca 100644
--- a/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.spvasm
index 6ff3c56..f84b1db 100644
--- a/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.spvasm
index 1ff3692..1a50e85 100644
--- a/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.spvasm
index 6d47335..75baa78 100644
--- a/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.spvasm
index 3051d77..1a67e14 100644
--- a/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.spvasm
index 4354b1d..15cf76a 100644
--- a/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.spvasm
index ea32bf4..95a961d 100644
--- a/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.spvasm
index 36dd837..5e6855c 100644
--- a/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.spvasm
index ae71ea8..c1a9fc3 100644
--- a/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.spvasm
index 87c4be6..b5aedc3 100644
--- a/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.spvasm
index da94c95..6a51d27 100644
--- a/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.spvasm
index 5c9029f..7b15a9f 100644
--- a/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.spvasm
index 4a4775b..5d5e776 100644
--- a/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.spvasm
index 6e262b2..4437747 100644
--- a/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.spvasm
index be6bf17..a3823c0 100644
--- a/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.spvasm
index 6229498..056d558 100644
--- a/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.spvasm
index 0f1bc18..1f4b976 100644
--- a/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.spvasm
index 43cdefa..5ac8e5c 100644
--- a/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.spvasm
index 8fe8338..f72307a 100644
--- a/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.spvasm
index 3a12c10..7f0534e 100644
--- a/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.spvasm
index b0148c2..1ae9501 100644
--- a/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.spvasm
index d69da12..1d5de8f 100644
--- a/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.spvasm
index 82c76d5..3bf6f74 100644
--- a/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.spvasm
index 801384e..8aa4cdc 100644
--- a/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.spvasm
index fa80405..3b9dc17 100644
--- a/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.spvasm
index 679b192..ac9764a 100644
--- a/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.spvasm
index c056b01..eeefbe9 100644
--- a/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.spvasm
index 8326d6a..c9c481f 100644
--- a/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.spvasm
index f6ffc87..f3280d9 100644
--- a/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.spvasm
index cc92228..6c8877b 100644
--- a/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.spvasm
index ee7237c..c07a44d 100644
--- a/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.spvasm
index d63879c..9d318b8 100644
--- a/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.spvasm
index c493cf6..4b50450 100644
--- a/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.spvasm
index 9221c01..95068e3 100644
--- a/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.spvasm
index e35680e..8164f30 100644
--- a/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.spvasm
index c7b7d58..7468fc6 100644
--- a/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.spvasm
index 90637e4..4485702 100644
--- a/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.spvasm
index 82a839c..8109ef9 100644
--- a/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.spvasm
index a9766d6..3ccff1a 100644
--- a/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.spvasm
index 7325ae8e..bd6fbde 100644
--- a/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.spvasm
index a231266..89d7be9 100644
--- a/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.spvasm
index bdc82d9..7fd686f 100644
--- a/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.spvasm
index b5bc34e..29d8a74 100644
--- a/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.spvasm
index d6d8604..8c6f98a 100644
--- a/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.spvasm
index 9287d22..6b20895 100644
--- a/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.spvasm
index 8d35e5c..6ffb24c 100644
--- a/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.spvasm
index 5b9b71d..52da791 100644
--- a/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.spvasm
index 897ab32..0586f14 100644
--- a/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.spvasm
index 819600c..d599281 100644
--- a/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.spvasm
index 5ba09f6..5f95150 100644
--- a/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.spvasm
index 875b3f4..4fb9b3f 100644
--- a/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/19accd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/19accd.wgsl.expected.spvasm
index 140b01e..db0838a 100644
--- a/test/tint/builtins/gen/var/step/19accd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/19accd.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/334303.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/334303.wgsl.expected.spvasm
index a2ca4d9..784d5a7 100644
--- a/test/tint/builtins/gen/var/step/334303.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/334303.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.spvasm
index 91b12f5..acee7a9 100644
--- a/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/415879.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/415879.wgsl.expected.spvasm
index 5244e41..8293186 100644
--- a/test/tint/builtins/gen/var/step/415879.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/415879.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/630d07.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/630d07.wgsl.expected.spvasm
index 380da8c..b60b282 100644
--- a/test/tint/builtins/gen/var/step/630d07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/630d07.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.spvasm
index 88920f7..169862e 100644
--- a/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/baa320.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/baa320.wgsl.expected.spvasm
index 4a4f122..cc69f30 100644
--- a/test/tint/builtins/gen/var/step/baa320.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/baa320.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.spvasm
index 76427e5..3eaf454 100644
--- a/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.spvasm
@@ -157,8 +157,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.spvasm
index 23a5ccf..ab789d6 100644
--- a/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.spvasm
index 42a48d4..35c54d0 100644
--- a/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
index b7ccc63..53b073d 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/0c84dd.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
index 3f08baf..6b09e56 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/139ad7.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/37b559.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
index 38fd131..36973d0 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/37b559.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
index 5a9105c..21eee96 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/4c307c.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/641635.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/641635.wgsl.expected.spvasm
index 47f4bd0..e29d6e7 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/641635.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/641635.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/67af87.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
index 48eb8f7..7a205ec 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/67af87.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
index 5aa7f73..b1d0324 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/93fa82.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
index b24ed8e..d35b061 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/b16d34.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
index bc92aa4..aaeb530 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/c857d1.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
index 5ecbee7..4ea5875 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/ea84a8.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
index edc1d31..74b698b 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/f695fe.wgsl.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
   %uint_1024 = OpConstant %uint 1024
diff --git a/test/tint/builtins/gen/var/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
index 8f6744e..2bcc7b19 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixLoad/fd7bd9.wgsl.expected.spvasm
@@ -31,7 +31,6 @@
                OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/127fb7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
index 5c4e6c7..7ce195d 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/127fb7.wgsl.expected.spvasm
@@ -24,7 +24,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
index d29c443..89118ac 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/2de0b1.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/49b25b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
index 9fdf5e5..f73e899 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/49b25b.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/5671e2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
index 34bb952..69cae1c 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/5671e2.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/5915fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
index ed0f769..f8a0946 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/5915fe.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
index 3b784d3..23e016c 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/9a7d60.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_uint_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %uint = OpTypeInt 32 0
     %uint_64 = OpConstant %uint 64
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
index 89d47ba..a949be4 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/b9ff25.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
index 3797b3e..c79e572 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/bfd0a4.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/d07581.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/d07581.wgsl.expected.spvasm
index d7545a8..0e05401 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/d07581.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/d07581.wgsl.expected.spvasm
@@ -24,7 +24,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
index 714b3db..7e60159 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/dc92cf.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_float_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/ee1195.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
index 9e1ac0f..822d716 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/ee1195.wgsl.expected.spvasm
@@ -24,7 +24,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_half_uint_64 ArrayStride 2
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %half = OpTypeFloat 16
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/subgroupMatrixStore/f04d67.wgsl.expected.spvasm b/test/tint/builtins/gen/var/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
index ab7cb63..9db988c 100644
--- a/test/tint/builtins/gen/var/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/subgroupMatrixStore/f04d67.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpName %compute_main_inner "compute_main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %compute_main "compute_main"
-               OpDecorate %_arr_int_uint_64 ArrayStride 4
                OpDecorate %compute_main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.spvasm
index 4785ada..fdb7260 100644
--- a/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.spvasm
index aee3ead..f78e042 100644
--- a/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/311400.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/311400.wgsl.expected.spvasm
index 8f31730..1878e76 100644
--- a/test/tint/builtins/gen/var/tan/311400.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/311400.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.spvasm
index a81f392..fda6769 100644
--- a/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.spvasm
index 8cdf2d2..db3de51 100644
--- a/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.spvasm
index 285d981..987c219 100644
--- a/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.spvasm
index f475bed..ff05d9b 100644
--- a/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.spvasm
index 647d34b..22ec17a 100644
--- a/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.spvasm
index 47c9a7e..0f202b3 100644
--- a/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.spvasm
index 8bf2dd6..6bf0b54 100644
--- a/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.spvasm
index e39d225..df453b2 100644
--- a/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.spvasm
index 3f1a2e9..0c6e5cb 100644
--- a/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.spvasm
index 2400657..589b89e 100644
--- a/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.spvasm
index 98bdd41..8d557c5 100644
--- a/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.spvasm
index 429e0d4..26e44ba 100644
--- a/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.spvasm
index bd0be11..f9cee54 100644
--- a/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.spvasm
index 657f773..5d231ce 100644
--- a/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.spvasm
index cacb566..b49d69a 100644
--- a/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.spvasm
index 0c546d8..b799a74 100644
--- a/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.spvasm
index aaead08..7aa9e1f 100644
--- a/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.spvasm
index e99f320..4351322 100644
--- a/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.spvasm
index 9f4e3fe..5104768 100644
--- a/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.spvasm
index fc74974..be30f96 100644
--- a/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.spvasm
index d7bce4f..a9122b2 100644
--- a/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.spvasm
index a81aca8..6931b52 100644
--- a/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.spvasm
index 231cae1..7f21d90 100644
--- a/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.spvasm
index ef379f9..0b7c53c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.spvasm
index 4c80b6f..5b7ee29 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.spvasm
index 5c92633..e9fa013 100644
--- a/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.spvasm
index 465a028..2391f9c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.spvasm
index 46a568c..fd8c0bc 100644
--- a/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.spvasm
index ae84c79..a7ce0d4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.spvasm
index 6d33170..baee272 100644
--- a/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.spvasm
index 67f82ee..23d442d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.spvasm
index 9cd3a72..5f4060a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.spvasm
index 6bf6fc3..02491f4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.spvasm
index ddace13..53e3ba2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.spvasm
index eb620a8..caa49dd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.spvasm
index 49656a1..ffa725a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.spvasm
index 06b2200..a96b849 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.spvasm
index 200903a..21c4564 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.spvasm
index 8f9f373..32b0343 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.spvasm
index 4b46196..09f0494 100644
--- a/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.spvasm
index d3f02eb..d158761 100644
--- a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.spvasm
index 77bbb6d..d8a659f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.spvasm
index cb3e5dc..3022380 100644
--- a/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.spvasm
index 2afe72f..45c9a00 100644
--- a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.spvasm
index 2944c03..2d36924 100644
--- a/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.spvasm
index 29d4d48..b4c3951 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.spvasm
index 3fecc3a..e32b3d5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.spvasm
index b90cb4e..0511ce2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.spvasm
index 7a88c11..2d40e13 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.spvasm
index edc9392..697fc30 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.spvasm
index 8ab51fb..19de4bf 100644
--- a/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.spvasm
index 0364a6a..f6119a3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.spvasm
index 11d063f..c53b8d6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.spvasm
index fef31ca..78bf2c9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.spvasm
index 64b251d..2552531 100644
--- a/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.spvasm
index 1e2e7fd..dce2c32 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.spvasm
index fb5005b..76cafd0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.spvasm
@@ -175,8 +175,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.spvasm
index b92fef1..dbf5b7d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.spvasm
index f3241de..9f172f2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.spvasm
index 1c42dce..4d34c6d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.spvasm
index a557d19..f0e3b3e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.spvasm
index 8f4752d..77ef7b2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.spvasm
index f7d1200..a6cd913 100644
--- a/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.spvasm
index 2e390f1..4c19132 100644
--- a/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.spvasm
index 7d0c424..2b0083e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.spvasm
index 338ccb9..4a8cc7b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.spvasm
index 01878ec..fde4d34 100644
--- a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.spvasm
index 2154c11..940a9e7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.spvasm
index f6cc8f6..55cfe42 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.spvasm
index 5be52c7..ad0dac4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.spvasm
@@ -166,8 +166,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.spvasm
index d0c89e9..682e0e3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.spvasm
index 1f362fc..d53337c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.spvasm
index 29e5219..464272d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.spvasm
index 09d55ca..f740828 100644
--- a/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.spvasm
index 6ddc905..7de0459 100644
--- a/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.spvasm
index f74249b..42adc44 100644
--- a/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.spvasm
index 74b4206..abb1ed6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.spvasm
index e37ea63..394d84b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.spvasm
index 7c7c04a..2e22beb 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.spvasm
index 28d24cf..f0121bc 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.spvasm
index deaa3c5..c4fad43 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.spvasm
index 0f3f611..98bbea1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.spvasm
index 0c51c1f..f86b040 100644
--- a/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.spvasm
index b59fc6f..66b68ed 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.spvasm
index e7fa2ea..af0f0a9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.spvasm
index 59abcc9..cebf95d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.spvasm
index 39d733d..c8e8245 100644
--- a/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.spvasm
index b4856d3..78bc410 100644
--- a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.spvasm
index c9211ff..96eb46a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.spvasm
index 2d6435c..08db7c1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.spvasm
index ec8d464..5a34d2f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.spvasm
index 5752401..5ec863b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.spvasm
index 7436590..16d6746 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.spvasm
index a9e19b6..8ae0ab1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.spvasm
index 7aebf54..23a40a9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.spvasm
index 8b7c816..65ba0b1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.spvasm
index c5acb04..bbd6ec5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.spvasm
index 4dea74e..a0988d7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.spvasm
index e15c08a..27d8638 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.spvasm
index 5b0c060..8805f9d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.spvasm
index 6088295..d9f04e8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.spvasm
index f9a625c..a87e17d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.spvasm
index f71c6e1..d7470c0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.spvasm
index 8f98e6e..ffe9beb 100644
--- a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.spvasm
index f71eb63..9a61ca0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.spvasm
index d7f5790..d81a0d5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.spvasm
index 4ebac31..c8cd916 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.spvasm
index 6c1ebd7..ad4d519 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.spvasm
index 9023385..2dd1785 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.spvasm
index 7885325..dfe6a25 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.spvasm
index 4445114..e0f966d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.spvasm
index 9c81a60..20a3be9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.spvasm
index 09ac41e..b303fe1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.spvasm
index 49a510a..05a1c47 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.spvasm
index f0f268c..405509c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.spvasm
index 0420ec4..780320a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.spvasm
index b1dd654..f7af049 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.spvasm
index 79b5846..c8078c2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.spvasm
index 5da01de..ff197ac 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.spvasm
index d06786a..afb2334 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.spvasm
index 5ff2cf2..8bba683 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.spvasm
index c2c803b..6faab6b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.spvasm
index 8090063..6f3120c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.spvasm
index 82c4e45..97700c4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.spvasm
@@ -163,8 +163,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.spvasm
index ecc84e9..c33becf 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.spvasm
index fa6fabb..9cd14c5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.spvasm
index c681779..f55f3a8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.spvasm
index afc862c..5c36a8d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.spvasm
index 6b21fba..92b7018 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.spvasm
index 2a95f85..6f6818e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.spvasm
index 3ccfeaa..00f91b9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.spvasm
index fa8fb35..b9805e1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.spvasm
index 3fc3420..fb29bb4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.spvasm
index b872655..824c694 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.spvasm
index 26da909..129fa62 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.spvasm
index 19c8e65..b34ae8f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.spvasm
index f345824..3767e78 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.spvasm
index 07186fb..3803e15 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.spvasm
index 772a492..57da566 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.spvasm
@@ -152,8 +152,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.spvasm
index a39eba5..48f6af5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.spvasm
@@ -110,28 +110,6 @@
                OpDecorate %11 DescriptorSet 1
                OpDecorate %11 Binding 2
                OpDecorate %11 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
 %prevent_dce_block = OpTypeStruct %v2uint
@@ -326,28 +304,6 @@
                OpDecorate %11 DescriptorSet 1
                OpDecorate %11 Binding 2
                OpDecorate %11 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
 %prevent_dce_block = OpTypeStruct %v2uint
@@ -546,30 +502,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.spvasm
index 5e3a830..0cfc311 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.spvasm
index bb45a63..56330da 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.spvasm
index 989618e..18f57a3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.spvasm
@@ -146,8 +146,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.spvasm
index dcef5e6..a44b701 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.spvasm
@@ -164,8 +164,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.spvasm
index aff63fb..5e95bc6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.spvasm
index 8e85d87..d7f55ba 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.spvasm
index 606d518..53adad5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.spvasm
index 04b9502..34f0b93 100644
--- a/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.spvasm
index 25f2394..0a63ca3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.spvasm
index 82f6ad6..2d72abe 100644
--- a/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.spvasm
index bd15778..22b6c2d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.spvasm
index db08093..f970576 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.spvasm
@@ -162,8 +162,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.spvasm
index 74ad992..d25ec2b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.spvasm
index 13fe866..9a669f9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.spvasm
index 4564239..bfe5c71 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.spvasm
index 3ec9a18..773c6e5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.spvasm
index d7b51cc..4a4d01e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.spvasm
index 04bc574..4e7431d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.spvasm
index 4f39926..d6e03c0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.spvasm
index ba7379f..c634620 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.spvasm
index 23e6426..38e92aa 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.spvasm
index 2baebe0..021f656 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.spvasm
index 0a2a52e..f65362c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.spvasm
index 99d2fba..0a59b42 100644
--- a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.spvasm
index e643733..d705805 100644
--- a/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.spvasm
index 0936e5e..16a440be 100644
--- a/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.spvasm
index 9a2bfab..b43b95c 100644
--- a/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.spvasm
index cb1ee1d..12bafd0 100644
--- a/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.spvasm
index ccfbc03..28e1e4a 100644
--- a/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.spvasm
index eeabf91..b477f4e 100644
--- a/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.spvasm
index f95f986..682ffec 100644
--- a/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.spvasm
index e99574b..9bea55d 100644
--- a/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.spvasm
index d0b34a7..9f0436e 100644
--- a/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.spvasm
index 95ccd68..9424852 100644
--- a/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.spvasm
index 89b59f6..5449149 100644
--- a/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.spvasm
index 23d1f41..460fa30 100644
--- a/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.spvasm
index 7ea28e7..36bab0a 100644
--- a/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.spvasm
index faa21a9..6a294ae 100644
--- a/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.spvasm
index 3fc8cce..c28a5c6 100644
--- a/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.spvasm
index 7f73956..7b17cc0 100644
--- a/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.spvasm
index f358f85..784987b 100644
--- a/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.spvasm
index 93ea653..3ae699f 100644
--- a/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.spvasm
index 62d1bc6..91ef064 100644
--- a/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.spvasm
index 4b54d96..f7065d3 100644
--- a/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.spvasm
index 045bdc2..d1b387a 100644
--- a/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.spvasm
index 2049ed5..32d7153 100644
--- a/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.spvasm
index a8284c4..8f0ccfd 100644
--- a/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.spvasm
index 27abd18..82f57bc 100644
--- a/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.spvasm
index 0ef6659..88fc4ed 100644
--- a/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.spvasm
index 1a35727..cf9fd1e 100644
--- a/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.spvasm
index 26c8d04..9bd54b8 100644
--- a/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.spvasm
index 08e8ca9..a16c82e 100644
--- a/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.spvasm
index 78738a8..3171c3a 100644
--- a/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.spvasm
index 740730f..6b2c3f3 100644
--- a/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.spvasm
index 08df0a3..161e2d2 100644
--- a/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.spvasm
index bcc982b..ca3a079 100644
--- a/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.spvasm
index 6dc8129..db85b03 100644
--- a/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.spvasm
index e3273d3..f2f3592 100644
--- a/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.spvasm
index 32100b0..4f0729c 100644
--- a/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.spvasm
index 97b8dd1..428fdf4 100644
--- a/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.spvasm
index 21d32e8..83bec13 100644
--- a/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.spvasm
index f44120d..46ef704 100644
--- a/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.spvasm
index b0fe4cc..3a3886c 100644
--- a/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.spvasm
index 883cfaf..0beff66 100644
--- a/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.spvasm
index 929421f..616ecca 100644
--- a/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.spvasm
index 421bf3f..1552376 100644
--- a/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.spvasm
index 5aa19cd..a5d52c9 100644
--- a/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.spvasm
index 4570897..4e355ea 100644
--- a/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.spvasm
index ca90769..cd69614 100644
--- a/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.spvasm
index 7bcc6a8..9157556 100644
--- a/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.spvasm
index e10bd9b..fa0b213 100644
--- a/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.spvasm
index d0323f2..a6290d8 100644
--- a/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.spvasm
index 72da25e3..4526a8c 100644
--- a/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.spvasm
index d186587..a400662 100644
--- a/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.spvasm
index b1d5e32..f73e02d 100644
--- a/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.spvasm
index cc64ece..5d81435 100644
--- a/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.spvasm
index 596a23c..cfe9eec3 100644
--- a/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.spvasm
index c67227a..a5252a6 100644
--- a/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.spvasm
index 02b5bf5..48c734a 100644
--- a/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.spvasm
index 6d42b95..dd6e58c 100644
--- a/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.spvasm
index 30f1d80..679dee9 100644
--- a/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.spvasm
index e8a8727..c59a213 100644
--- a/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.spvasm
index 320d7ea..e016fc6 100644
--- a/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.spvasm
index 30231ca..c03a730 100644
--- a/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.spvasm
index 6b08305..b448d95 100644
--- a/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.spvasm
index 8df6a7e..9ee1757 100644
--- a/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.spvasm
index bd33088..a77c583 100644
--- a/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.spvasm
index afcc3f8..d54da49 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.spvasm
index ea88867..f930752 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.spvasm
index 122af25..ad7f8c7 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.spvasm
index b11a4c7..7bc0bcf 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.spvasm
index 44b3055..c901f53 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.spvasm
index 03be2ce..e8c82c4 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.spvasm
index 00ab177..c93d9c7 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.spvasm
index adc1682..bc84213 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.spvasm
@@ -207,8 +207,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.spvasm
index 1635dae..e415a97 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.spvasm
@@ -213,8 +213,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.spvasm
index c508e67..1af7bc1 100644
--- a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.spvasm
index 3929f31..9e20818 100644
--- a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.spvasm
index 7107541..36a8aaf 100644
--- a/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.spvasm
index 66e1885..628106a 100644
--- a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.spvasm
@@ -218,8 +218,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.spvasm
index 79a696a..785db56 100644
--- a/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.spvasm
index 03f5788..a3921c7 100644
--- a/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.spvasm
index d4ae09c..f7796b0 100644
--- a/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.spvasm
index 315771a..71cbeba 100644
--- a/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.spvasm
index 12db9b1..5f3809a 100644
--- a/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.spvasm
index bab3503..7dee986 100644
--- a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.spvasm
index 7269f09..675faf8 100644
--- a/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.spvasm
index 72461a0..a6cdbf1 100644
--- a/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.spvasm
index 2030dc4..228d824 100644
--- a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.spvasm
@@ -190,8 +190,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.spvasm
index e9833ec..acb331f 100644
--- a/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.spvasm
index e9fda92..e854dc9 100644
--- a/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.spvasm
index 050e356..3fcefe9 100644
--- a/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.spvasm
index 5cc1441..18ca82a 100644
--- a/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.spvasm
index 43c0938..1d5ef8f 100644
--- a/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.spvasm
index d07afc7..e21b35d 100644
--- a/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.spvasm
index da28a0a..c54a0ba 100644
--- a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.spvasm
index 445efc0..ea9763a 100644
--- a/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.spvasm
index 873acb9..61840cc 100644
--- a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.spvasm
index 175dd9b..fc0660a 100644
--- a/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.spvasm
index a5f5a7d..c88abd1 100644
--- a/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.spvasm
index 4569571..ff2da81 100644
--- a/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.spvasm
index 7f86d3a..3737c72 100644
--- a/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.spvasm
index 26350e0..71e6115 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.spvasm
index 71b0ab7..d148421 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.spvasm
index 49d6e395..d6e8b76 100644
--- a/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.spvasm
@@ -120,28 +120,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -445,28 +423,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -774,30 +730,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.spvasm
index 22ac8f8..785e7c5 100644
--- a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.spvasm
index f1b2391..aa13e20 100644
--- a/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.spvasm
index 6aca508..ae499c4 100644
--- a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.spvasm
index acfd3a5..8e29e08 100644
--- a/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.spvasm
index c260985..23de35a 100644
--- a/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.spvasm
@@ -211,8 +211,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.spvasm
index f27b4de..424d6f2 100644
--- a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.spvasm
index 802e177..565fd12 100644
--- a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.spvasm
index f1a2c67..cdde5f4 100644
--- a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.spvasm
index 6509375..58e586c 100644
--- a/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.spvasm
index 8216768..e29707a 100644
--- a/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.spvasm
@@ -205,8 +205,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.spvasm
index 22da2cd..d141898 100644
--- a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.spvasm
index 6749a1d..6afc2ae 100644
--- a/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.spvasm
index ad4a9a9..4a3b796 100644
--- a/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.spvasm
index a68113e..905f639 100644
--- a/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.spvasm
index 4b18678..b8073bf 100644
--- a/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.spvasm
index 33273ca..652e77f 100644
--- a/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.spvasm
index 20fdb8a..cd57286 100644
--- a/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.spvasm
index f98bc1a..3d1074b 100644
--- a/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.spvasm
index db42dc3..23d1f60 100644
--- a/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.spvasm
index b86c879..eb571ef 100644
--- a/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.spvasm
index ae18f20..dc33660 100644
--- a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.spvasm
index b4d718b..d145b12 100644
--- a/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.spvasm
index f3e9a37..5f59b38 100644
--- a/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.spvasm
index fecd665..fa3ca7f 100644
--- a/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.spvasm
index de91655..07669de 100644
--- a/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.spvasm
index 92d8962..5ccbf83 100644
--- a/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.spvasm
index 3d92d20..885c141 100644
--- a/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.spvasm
index f18115b..647917c 100644
--- a/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.spvasm
index 33bee01..d406b19 100644
--- a/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.spvasm
index c329b00..b3bcae1 100644
--- a/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.spvasm
@@ -211,8 +211,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.spvasm
index c9f972d..f83b0ed 100644
--- a/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.spvasm
index 89d10db..965f7eb 100644
--- a/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.spvasm
index 042a948..d03bf0e 100644
--- a/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.spvasm
index 5ef624f..c9e7644 100644
--- a/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.spvasm
index 433ca94..cad816c 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.spvasm
index f80f6da..187588d 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.spvasm
index fcfc9ec..c6862f1 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.spvasm
@@ -218,8 +218,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.spvasm
index 3db6866..a7331f1 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.spvasm
index d978114..080e49f 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.spvasm
index dbac9a3..9cd211d 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.spvasm
index 699a35a..14a113b 100644
--- a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.spvasm
@@ -190,8 +190,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.spvasm
index e3965e8..71f2333 100644
--- a/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.spvasm
index 8823e37..61233e8 100644
--- a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.spvasm
index f9f0a39..0dda7ed 100644
--- a/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.spvasm
index 31e4ca4..4cd958f 100644
--- a/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.spvasm
index 72d2442..697e22e 100644
--- a/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.spvasm
index 15853bf..bd5b478 100644
--- a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.spvasm
index 91f0c91..b0dafdb 100644
--- a/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.spvasm
index 21f4df4..c425ac6 100644
--- a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.spvasm
index 96ef24a..5f9c3a0 100644
--- a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.spvasm
index 2969e74..3ffff25 100644
--- a/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.spvasm
@@ -205,8 +205,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.spvasm
index ee435bb..438ff0f 100644
--- a/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.spvasm
index 1f0a543..7766d62 100644
--- a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.spvasm
@@ -222,8 +222,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.spvasm
index 0e0acb0..0f6e523 100644
--- a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.spvasm
index 68b1a33..bbe1def 100644
--- a/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.spvasm
index 82c805d..4524306 100644
--- a/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.spvasm
index faca5263..ef3a61c 100644
--- a/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.spvasm
index 2cae1f9..7c787bb 100644
--- a/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.spvasm
index b3554ea..647ba3a 100644
--- a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.spvasm
index 155f602..4b28287 100644
--- a/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.spvasm
index 7bfb6a9..7245c81 100644
--- a/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.spvasm
index a2a5465..53fc78c 100644
--- a/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.spvasm
index 0b562f7..3f2b82a 100644
--- a/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.spvasm
index 8aafa9d..9db7203 100644
--- a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.spvasm
index a578ef8..f8d3b0f 100644
--- a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.spvasm
index 5cfb82f..61f984f 100644
--- a/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.spvasm
index d678fa1..09c43b5 100644
--- a/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.spvasm
index 8bcfa28..6f5fce6 100644
--- a/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.spvasm
index 27deb03..bc55566 100644
--- a/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.spvasm
index 346e031..4d823da 100644
--- a/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.spvasm
index 22155a2..86b12c5 100644
--- a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.spvasm
index c6ce538..041f86c 100644
--- a/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.spvasm
@@ -173,8 +173,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.spvasm
index abf0841..6f74b50 100644
--- a/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.spvasm
@@ -177,8 +177,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.spvasm
index a29fe7a..e7a40b0 100644
--- a/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.spvasm
index 49bd1d9..d69b5b4 100644
--- a/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.spvasm
index 8ca8677..f24abb4 100644
--- a/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.spvasm
index a606632..d5682d2 100644
--- a/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.spvasm
index ab07ec7..9c0d254 100644
--- a/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.spvasm
index 79fd768..8408f63 100644
--- a/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.spvasm
index 4661a91..52acd97 100644
--- a/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.spvasm
index 6dd5fc9..b54affa 100644
--- a/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.spvasm
index 97ffb61..3bda45f 100644
--- a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.spvasm
index 1a6fe72..75b69bb 100644
--- a/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.spvasm
index 62f7b91..5ce2f67 100644
--- a/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.spvasm
index 4a82ac2..2074e29 100644
--- a/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.spvasm
index 24ab18b..4df95ba 100644
--- a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.spvasm
index 3504df6..ad2d6fe 100644
--- a/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.spvasm
index 78e59e3..275106c 100644
--- a/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.spvasm
index 319799d..c30a3d4 100644
--- a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.spvasm
index 1e76886..7721939 100644
--- a/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.spvasm
index 809b068..843183e 100644
--- a/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.spvasm
index e843bc6..4c74aa1 100644
--- a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.spvasm
index 211b4f9..e4dc4e9 100644
--- a/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.spvasm
index 6cb6c8d..accb5d8 100644
--- a/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.spvasm
index 1de6541..a9e04b4 100644
--- a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.spvasm
index 49db310..9177765 100644
--- a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.spvasm
index 2e7ae30..3c79aad 100644
--- a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.spvasm
index f1a9c0b..f269487 100644
--- a/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.spvasm
index 45569ef..2d8f540 100644
--- a/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.spvasm
index c7cbdc8..514729a 100644
--- a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.spvasm
index 3485960..c411dd5 100644
--- a/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.spvasm
index 0a0dc6c..a84a360 100644
--- a/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.spvasm
index 4ccbf02..a46d131 100644
--- a/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.spvasm
index edf2a71..cffd83a 100644
--- a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.spvasm
@@ -222,8 +222,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.spvasm
index b5435ad..a0bfbc7 100644
--- a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.spvasm
index fc90079..9c15d8a 100644
--- a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.spvasm
index 1fb48e5..a00a764 100644
--- a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.spvasm
index 3deae78..a3fe28b 100644
--- a/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.spvasm
index 1dc7f6b..85b0712 100644
--- a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.spvasm
index 0f4626d..9827cb2 100644
--- a/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.spvasm
index 08dfdbf..314f4af 100644
--- a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.spvasm
index c6732ac..ff61b0e 100644
--- a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.spvasm
@@ -190,8 +190,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.spvasm
index d38fbff..41c5efd 100644
--- a/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.spvasm
index eabf801..9b0d46d 100644
--- a/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.spvasm
index 7d687cc..b28b7a1 100644
--- a/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.spvasm
index 620de43..780fd45 100644
--- a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.spvasm
index d9d1c74..42c6aa9 100644
--- a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.spvasm
index 9d8d682..b0a239e 100644
--- a/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.spvasm
index cf24fba..07a98d8 100644
--- a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.spvasm
@@ -222,8 +222,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.spvasm
index 5cb09e5..bd7e8ea 100644
--- a/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.spvasm
index 762ab7b..80fcc07 100644
--- a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.spvasm
index c6fdd91..d267e90 100644
--- a/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.spvasm
index bf21f80..0303e01 100644
--- a/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.spvasm
index edc2a42..c3f4998 100644
--- a/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.spvasm
@@ -120,28 +120,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -450,28 +428,6 @@
                OpDecorate %10 DescriptorSet 1
                OpDecorate %10 Binding 2
                OpDecorate %10 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -784,30 +740,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.spvasm
index d5ae3b1..918281f 100644
--- a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.spvasm
index 5e809d3..f4a9b9c 100644
--- a/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.spvasm
index 0d739eb..e26baf9 100644
--- a/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.spvasm
index 8ca131a..919062c 100644
--- a/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.spvasm
index 5b647aa..db576e2 100644
--- a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.spvasm
index c94dd27..f936fad 100644
--- a/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.spvasm
index 494d665..5e528c5 100644
--- a/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.spvasm
index 718a2b3..443d039 100644
--- a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.spvasm
index aedfa8a..4dea890 100644
--- a/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.spvasm
index 2f3d432..eba08af 100644
--- a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.spvasm
index 5260ca7..d69180e 100644
--- a/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.spvasm
index d00aa32..c6d3d32 100644
--- a/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.spvasm
index 9f11c92..c23f61a 100644
--- a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.spvasm
index f2d6370..bf11dfe 100644
--- a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.spvasm
@@ -224,8 +224,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.spvasm
index 95f8aed..cbdcc2f 100644
--- a/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.spvasm
index 78b285a..9886ff5 100644
--- a/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.spvasm
index 6d05c5c..460f759 100644
--- a/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.spvasm
index 7a38e21..63d0370 100644
--- a/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.spvasm
@@ -207,8 +207,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.spvasm
index 300a25e..444387a 100644
--- a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.spvasm
index 2113fac..256512d 100644
--- a/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.spvasm
index 83190be..1aec1f9 100644
--- a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.spvasm
index 25e93ab..6a12d6a3 100644
--- a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.spvasm
index 07c3a9e..e7a6efc 100644
--- a/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.spvasm
index ea420cd..edda4bd 100644
--- a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.spvasm
index c6d4a41..b2ad41b 100644
--- a/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.spvasm
index b1d5e8d..65945e9 100644
--- a/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.spvasm
index e8107f7..155e765 100644
--- a/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.spvasm
index 36ec883..7e27c65 100644
--- a/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.spvasm
index 33ceebd..51305ac 100644
--- a/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.spvasm
index d6d9530..ed61c5a 100644
--- a/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.spvasm
index 7af8e79..9b1f7d9 100644
--- a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.spvasm
index 882539b..1d49ef3 100644
--- a/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.spvasm
index 422ca98..2085fb7 100644
--- a/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.spvasm
index ec93078..c86a961 100644
--- a/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.spvasm
@@ -198,8 +198,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.spvasm
index bafe0d5..7dc0ae4 100644
--- a/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.spvasm
index c016de6..e5ca442 100644
--- a/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.spvasm
@@ -168,8 +168,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.spvasm
index 6bfdf74..f3ae990 100644
--- a/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.spvasm
index ad384cb..0e98aa7 100644
--- a/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.spvasm
index bc96eb4..360af2c 100644
--- a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.spvasm
index f339ae5..5b22980 100644
--- a/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.spvasm
index 0c67664..24c3051 100644
--- a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.spvasm
@@ -218,8 +218,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.spvasm
index 896d3b0..9d18435 100644
--- a/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.spvasm
index 6c00752..faa3fa4 100644
--- a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.spvasm
index 2dd3de1..02d4e2b 100644
--- a/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.spvasm
@@ -189,8 +189,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.spvasm
index 119d37c..22b1b40 100644
--- a/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.spvasm
index e450436..5d42945 100644
--- a/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.spvasm
index 4af41fe..90a8653 100644
--- a/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.spvasm
index 8f0f89a..569012f 100644
--- a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.spvasm
@@ -180,8 +180,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.spvasm
index 82d56f9..f35fd51 100644
--- a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.spvasm
@@ -191,8 +191,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.spvasm
index 50ab4d3..cf42353 100644
--- a/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.spvasm
index 61de51a..7ba2a70 100644
--- a/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.spvasm
index 569e370..a341273 100644
--- a/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.spvasm
index fe30b0c..9cdc710 100644
--- a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.spvasm
@@ -224,8 +224,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.spvasm
index c4bc618..e42e91d 100644
--- a/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.spvasm
index 3cf1890..4616d04 100644
--- a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.spvasm
index e1d0a29..fa03adc 100644
--- a/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.spvasm
index 4c59c0f..ea4ccb7 100644
--- a/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.spvasm
index effe863..2aa5289 100644
--- a/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.spvasm
index 884bb06..55a4898 100644
--- a/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.spvasm
index 3c6cfe2..0886ad7 100644
--- a/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.spvasm
index c464827..8ea846f 100644
--- a/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.spvasm
index de412d9..63342f1 100644
--- a/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.spvasm
@@ -197,8 +197,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.spvasm
index 77bd923..121e1a5 100644
--- a/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.spvasm
index 17049b1..b1a2e25 100644
--- a/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.spvasm
index ca5b4a8..c91f369 100644
--- a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.spvasm
@@ -218,8 +218,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.spvasm
index 8199692..98bcc1e 100644
--- a/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.spvasm
index 4b7a8c9..56ed4a2 100644
--- a/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.spvasm
index 3b96271..629e28a 100644
--- a/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.spvasm
index 6f9fffd..4451ec7 100644
--- a/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.spvasm
@@ -178,8 +178,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.spvasm
index f05d420..f22c0a6 100644
--- a/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.spvasm
index 4b6cfe3..d8aa284b 100644
--- a/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.spvasm
index ba56341..440022d 100644
--- a/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.spvasm
index 59dc3ee..f704545 100644
--- a/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.spvasm
index 9512f58..be9aeb2 100644
--- a/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.spvasm
index 78f3966..a8ee96f 100644
--- a/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.spvasm
index 514a71e..1d556c3 100644
--- a/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.spvasm
@@ -199,8 +199,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.spvasm
index a70d6e8..40fc76c 100644
--- a/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.spvasm
index 057c776..9f2770f 100644
--- a/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.spvasm
index 244e9ee..9073cb5 100644
--- a/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.spvasm
index cc669a9..db3b914 100644
--- a/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.spvasm
index a0c3578..36b7a27 100644
--- a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.spvasm
index 77320a5..d05c015 100644
--- a/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.spvasm
index 1e7b8eb..0e07a44 100644
--- a/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.spvasm
@@ -187,8 +187,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.spvasm
index 46544fe..18921f9 100644
--- a/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.spvasm
@@ -204,8 +204,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.spvasm
index 4a08408..fc31935 100644
--- a/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.spvasm
@@ -172,8 +172,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.spvasm
index b0e8882..9ffb6c8 100644
--- a/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.spvasm
index b9a6074..f699bce 100644
--- a/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.spvasm
index db4e9fc..edca2fe 100644
--- a/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.spvasm
index 7a99f1e..879ebd2 100644
--- a/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.spvasm
index 2aebd02..ac1a1ee 100644
--- a/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.spvasm
index ddfb19a..13f3834 100644
--- a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.spvasm
index c42db80..210cb28 100644
--- a/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.spvasm
index be9bd09..13c3f43 100644
--- a/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.spvasm
index 777d3ab..4c4efc2 100644
--- a/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.spvasm
@@ -207,8 +207,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.spvasm
index 3fddba5..dce87df 100644
--- a/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.spvasm
@@ -182,8 +182,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.spvasm
index 020649b..880a411 100644
--- a/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.spvasm
index 7056a1f..08ffc8e 100644
--- a/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.spvasm
index 1223d82..8721ab8 100644
--- a/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.spvasm
index 838776a..bbde237 100644
--- a/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.spvasm
@@ -171,8 +171,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.spvasm
index f77b4b3..61fa40b 100644
--- a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.spvasm
index 09d0b5d..595f5d4 100644
--- a/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.spvasm
index e070a8e..939ac0d 100644
--- a/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.spvasm
index bd4c8c5..016ba27 100644
--- a/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.spvasm
@@ -179,8 +179,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.spvasm
index b9bf52a..77ab71f 100644
--- a/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.spvasm
@@ -174,8 +174,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.spvasm
index 5364458..307d6f9 100644
--- a/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.spvasm
@@ -184,8 +184,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.spvasm
index 85f9e4d..9d43f8b 100644
--- a/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.spvasm
index e01acd9..c6ed1ed 100644
--- a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.spvasm
@@ -193,8 +193,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.spvasm
index f580270..b78fee6 100644
--- a/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.spvasm
@@ -183,8 +183,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.spvasm
index 1cee000..fc225a9 100644
--- a/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.spvasm
index 4d7da44..a8041ca 100644
--- a/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.spvasm
index 5180fe7..3cf9959 100644
--- a/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.spvasm
@@ -185,8 +185,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.spvasm
index 78e9013..bbe5c7e 100644
--- a/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.spvasm
@@ -169,8 +169,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.spvasm
index e565aa2..203116e 100644
--- a/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.spvasm
@@ -206,8 +206,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.spvasm
index b643aa3..8e47654 100644
--- a/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.spvasm
index e05a6c7..89a366b 100644
--- a/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.spvasm
index 8340923..0bf1f6a 100644
--- a/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.spvasm
@@ -181,8 +181,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.spvasm
index c87e633..e7ceb4d 100644
--- a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.spvasm
@@ -224,8 +224,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.spvasm
index 9f004f3..7676cfe 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.spvasm
index 3379152..9a6aa53 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.spvasm
index 5eb89aa..cf2c728 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.spvasm
index b808cb5..e6d08aa 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.spvasm
index 924ebdd..e3e12c3 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.spvasm
index 91834a6..4088e42 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.spvasm
index cc15c9e..f22f238 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.spvasm
index 7011f2f..ec1defc 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.spvasm
index 22702be..e537ebb 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.spvasm
index c1128e7..a9a8975 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.spvasm
index 392fbbf..3e8e01c 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.spvasm
index 913957c..fa879f3 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.spvasm
index cf09ecc..04f4ec8 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.spvasm
index fc68b13..652815d 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 R8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.spvasm
index 88def4b..62de309 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.spvasm
index f591926..7e6fa1e 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.spvasm
index e04145a..35f15de 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.spvasm
index a2885da..b48999d 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.spvasm
index acb2616..471b4d3 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.spvasm
@@ -142,8 +142,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.spvasm
index e3946e3..f27b94d 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.spvasm
index eb6c138..a79dd91 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.spvasm
index 83cb30b..e25e0a3 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.spvasm
index 837c435..0c17856 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.spvasm
@@ -150,8 +150,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.spvasm
index e25be5d..7f0f344 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.spvasm
index 06668f9..2ae505d 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.spvasm
@@ -145,8 +145,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.spvasm
index 3ae9f057..0de1336 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.spvasm
@@ -147,8 +147,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.spvasm
index 9dc3eae..43ebde8 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.spvasm
index 599e559..7f3f879 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.spvasm
index 0816d3c..6dfde08 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.spvasm
index 682b8bf..e151ac0 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.spvasm
index 16d1c36..af083f5 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.spvasm
index cab7420..701bd30 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.spvasm
index c5759dc..b13d68e 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.spvasm
index f3ebcc4..c7b5923 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.spvasm
index dde4f93..39c33b6 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.spvasm
index ac8dae0..2d40d12 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.spvasm
index 417716f..af36d41 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.spvasm
index a35ae48..feedb3e 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.spvasm
index 7fb6c5a..e2efcde 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.spvasm
index 0c37f34..dbb00d9 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.spvasm
index 8f2c9c4..8bdff58 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.spvasm
index 3c50355..1f97342 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.spvasm
index 1107c15..13f0091 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.spvasm
index f30152e..cae5b5c 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.spvasm
index 4acbbb9..7be66f3 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.spvasm
index 80634c9..d8f28ac 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.spvasm
index 32dd711..2b9a0f2 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.spvasm
@@ -143,8 +143,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 1D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.spvasm
index d91b2e5..46ae8b8 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.spvasm
@@ -141,8 +141,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.spvasm
index 821e4f7..665a040 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeImage %uint 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.spvasm
index fd80e1c..1e5ec33 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
         %int = OpTypeInt 32 1
           %3 = OpTypeImage %int 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.spvasm
index 0075f7b..1166f01 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.spvasm
index f1e3aab..02f7066 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.spvasm
@@ -140,8 +140,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
index 26efd9e..46f4e57 100644
--- a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.spvasm
@@ -124,28 +124,6 @@
                OpDecorate %10 NonWritable
                OpDecorate %arg_1 DescriptorSet 1
                OpDecorate %arg_1 Binding 1
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -457,28 +435,6 @@
                OpDecorate %10 NonWritable
                OpDecorate %arg_1 DescriptorSet 1
                OpDecorate %arg_1 Binding 1
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %prevent_dce_block = OpTypeStruct %v4float
@@ -794,30 +750,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
index 3536568..7446a94 100644
--- a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.spvasm
@@ -201,8 +201,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
index 41df0aa..5381b17 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
@@ -207,8 +207,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
index 7af7810..837b166 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
index 40e5f98..df0256c 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
@@ -186,8 +186,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
index 9a2f24e..5d934b5 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
index 9a57e75..e4e672d 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.spvasm
@@ -205,8 +205,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
index 292e093..87d824c 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
index 6e39aea..13c699b 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
index b4005a9..e8f021b 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.spvasm
@@ -211,8 +211,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
index 13ceade..a19dc4f 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.spvasm
@@ -213,8 +213,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.spvasm
index f86284b..4101480 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
index 728437f..6bfc71a 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.spvasm
index 9b034fc..91cd831 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.spvasm
index c3542b0..5777163 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.spvasm
@@ -195,8 +195,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.spvasm
index a0f03f7..c3be96f 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.spvasm
index 8277f8b..ac60b63 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.spvasm
@@ -222,8 +222,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.spvasm
index a368001..8357432 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.spvasm
@@ -214,8 +214,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.spvasm
index 2d60b0e..6916a91 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
index dee8905..1c93eae 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.spvasm
@@ -203,8 +203,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.spvasm
index ec7adb5..db40c96 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.spvasm
@@ -220,8 +220,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.spvasm
index 5f039f9..40e022e 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.spvasm
@@ -217,8 +217,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.spvasm
index 81a02f7..7a454cd 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
index f34223b..973d62c 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
index a4f3fcf..ea15ba0 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.spvasm
index 3dcae3f..80b3ba4 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.spvasm
index 688c19a..95686c8 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.spvasm
@@ -211,8 +211,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.spvasm
index 9a88922..aa3bd69 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.spvasm
@@ -207,8 +207,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.spvasm
index 0306867..6385e9b 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.spvasm
index 9aa4978..a8da3b7 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.spvasm
index 86a1d54..07013ac 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.spvasm
index 7144fb5..157d88c 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.spvasm
@@ -219,8 +219,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.spvasm
index 8ec0613..43b6f31 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.spvasm
index bb98f17..dede349 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.spvasm
@@ -209,8 +209,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.spvasm
index be79d5b..cf5fda2 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.spvasm
index 08b308d..f99b4cd 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.spvasm
@@ -200,8 +200,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.spvasm
index 0a082b3..3cb6e5d9 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.spvasm
@@ -210,8 +210,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.spvasm
index 60a5458..297f090 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.spvasm
index dd25d2a..36bd4a0 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.spvasm
@@ -208,8 +208,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.spvasm
index 78c9ad3..04824a5 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.spvasm
index c0c1384..be896a8 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.spvasm
@@ -212,8 +212,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.spvasm
index 5fbc55a..550bd3d 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.spvasm
@@ -194,8 +194,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.spvasm
index 8b7835e..fa9f07f 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.spvasm
@@ -213,8 +213,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.spvasm
index 39a5533..d241ee2 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.spvasm
index 9007c1d..3a5f5fd 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.spvasm
@@ -188,8 +188,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
index 46d4df8..d87ed7b 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.spvasm
@@ -217,8 +217,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.spvasm
index dd10139..ac84e20 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.spvasm
@@ -196,8 +196,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
index 12ce2ed..4b6cdcb 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.spvasm
@@ -219,8 +219,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
index 6737790..b37684f 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.spvasm
@@ -202,8 +202,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.spvasm
index bac5865..f2cf210 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.spvasm
@@ -215,8 +215,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.spvasm
index 83bdfa2..66097d9 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.spvasm
@@ -216,8 +216,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float Cube 0 1 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.spvasm
index a54e23d..d58e40e 100644
--- a/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.spvasm
index d8e56a4..b02c0e7 100644
--- a/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.spvasm
index 8232858..311265e 100644
--- a/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.spvasm
index 5e5f708..5c65457 100644
--- a/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.spvasm
index 01563b4..b73d476 100644
--- a/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.spvasm
index 8b13306..70da463 100644
--- a/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.spvasm
index 8ec9262..a31f424 100644
--- a/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.spvasm
index 94b91e7..ed4a731 100644
--- a/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.spvasm
index b7a5cf9..4800dd7 100644
--- a/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.spvasm
index 1d0c918..d9dff87 100644
--- a/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.spvasm
index 6b0a296..b6681ad 100644
--- a/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.spvasm
index a7d1963..ff4b47f 100644
--- a/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.spvasm
index 4c79fd7..ec91ff9 100644
--- a/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.spvasm
index 5f40505..9bc5d57 100644
--- a/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.spvasm
index cbfc15b..29e3387 100644
--- a/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.spvasm
index dad5347..bc8768d 100644
--- a/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.spvasm
@@ -170,8 +170,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.spvasm
index 05de48f..860dac9 100644
--- a/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.spvasm
index 6c69336..cba6d0d 100644
--- a/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.spvasm
index c13353f..bc2b0cc 100644
--- a/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.spvasm
index fee2164..71c95c1 100644
--- a/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.spvasm
index eacab1e..dff010f 100644
--- a/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.spvasm
index ec20a8b..9df29c5 100644
--- a/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.spvasm
@@ -161,8 +161,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.spvasm
index 33cf1a8..f14b407 100644
--- a/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.spvasm
index abaa541..2d94286 100644
--- a/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.spvasm
index 5161ce7..885bf7a 100644
--- a/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.spvasm
@@ -90,7 +90,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.spvasm
index 9b4651b..1d0dae4 100644
--- a/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.spvasm
@@ -167,8 +167,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.spvasm b/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.spvasm
index d9f5eae..4765252 100644
--- a/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.spvasm
@@ -176,8 +176,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.spvasm
index 8ef8761..45d376a 100644
--- a/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.spvasm
index 357d466..7b67329 100644
--- a/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.spvasm
index d567065..6251770 100644
--- a/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.spvasm
index 580a8a8..ba2c52c 100644
--- a/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.spvasm
@@ -82,7 +82,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.spvasm
index 796ea90..025690b 100644
--- a/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.spvasm
index 5edabf9..6cf4f12 100644
--- a/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.spvasm
index 32cb898..8ae1693 100644
--- a/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.spvasm
@@ -144,8 +144,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.spvasm
index 2b6998a..c2e72cc 100644
--- a/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.spvasm
@@ -148,8 +148,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.spvasm
index 6decbfb..57b9772 100644
--- a/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.spvasm
index 9da6a76..e90b4df 100644
--- a/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.spvasm
@@ -134,8 +134,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.spvasm
index 5f27fba..fcfa4d2 100644
--- a/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.spvasm
@@ -86,7 +86,6 @@
                OpName %vertex_main "vertex_main"
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.spvasm
index 51efc7f..a359c29 100644
--- a/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.spvasm
index 1800729..931946d 100644
--- a/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
index 81f68dd..e4306b5 100644
--- a/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.spvasm
index 03b8581..da9cccd 100644
--- a/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.spvasm
index f2cbdbb..4f3724e 100644
--- a/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.spvasm
index b553528..1d4e9ae 100644
--- a/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.spvasm
@@ -138,8 +138,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.spvasm
index 407029c..298c94a 100644
--- a/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.spvasm
@@ -153,8 +153,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.spvasm b/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.spvasm
index 051231d..ba7888d 100644
--- a/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.spvasm
@@ -149,8 +149,6 @@
                OpDecorate %vertex_main_loc0_Output Location 0
                OpDecorate %vertex_main_loc0_Output Flat
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/builtins/modf/scalar/const.wgsl.expected.spvasm b/test/tint/builtins/modf/scalar/const.wgsl.expected.spvasm
index 8885d77..3ef4aae 100644
--- a/test/tint/builtins/modf/scalar/const.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/scalar/const.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/modf/scalar/mixed.wgsl.expected.spvasm b/test/tint/builtins/modf/scalar/mixed.wgsl.expected.spvasm
index ae58e25..b9336b2 100644
--- a/test/tint/builtins/modf/scalar/mixed.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/scalar/mixed.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/modf/scalar/runtime.wgsl.expected.spvasm b/test/tint/builtins/modf/scalar/runtime.wgsl.expected.spvasm
index 70ce620..a623b93 100644
--- a/test/tint/builtins/modf/scalar/runtime.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/scalar/runtime.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/modf/vector/const.wgsl.expected.spvasm b/test/tint/builtins/modf/vector/const.wgsl.expected.spvasm
index e0bb890..9da9158 100644
--- a/test/tint/builtins/modf/vector/const.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/vector/const.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/modf/vector/mixed.wgsl.expected.spvasm b/test/tint/builtins/modf/vector/mixed.wgsl.expected.spvasm
index 4a81b1b..079c3ca 100644
--- a/test/tint/builtins/modf/vector/mixed.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/vector/mixed.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/modf/vector/runtime.wgsl.expected.spvasm b/test/tint/builtins/modf/vector/runtime.wgsl.expected.spvasm
index 2e3a817..a8ce920 100644
--- a/test/tint/builtins/modf/vector/runtime.wgsl.expected.spvasm
+++ b/test/tint/builtins/modf/vector/runtime.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %res "res"
                OpName %fract "fract"
                OpName %whole "whole"
-               OpMemberDecorate %__modf_result_vec2_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_vec2_f32 1 Offset 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/builtins/textureDimensions/depth_ms.spvasm.expected.spvasm b/test/tint/builtins/textureDimensions/depth_ms.spvasm.expected.spvasm
index 139709a..e855c5f 100644
--- a/test/tint/builtins/textureDimensions/depth_ms.spvasm.expected.spvasm
+++ b/test/tint/builtins/textureDimensions/depth_ms.spvasm.expected.spvasm
@@ -27,7 +27,6 @@
                OpDecorate %arg_0 Binding 0
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %vertex_main_out 0 Offset 0
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/textureLoad/depth_ms.spvasm.expected.spvasm b/test/tint/builtins/textureLoad/depth_ms.spvasm.expected.spvasm
index 9978152..aa699de 100644
--- a/test/tint/builtins/textureLoad/depth_ms.spvasm.expected.spvasm
+++ b/test/tint/builtins/textureLoad/depth_ms.spvasm.expected.spvasm
@@ -28,7 +28,6 @@
                OpDecorate %arg_0 Binding 0
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %vertex_main_out 0 Offset 0
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.spvasm b/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.spvasm
index db86e08..752e34c 100644
--- a/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.spvasm
+++ b/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.spvasm
@@ -121,28 +121,6 @@
                OpDecorate %6 NonWritable
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
@@ -458,28 +436,6 @@
                OpDecorate %6 DescriptorSet 1
                OpDecorate %6 Binding 2
                OpDecorate %6 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
@@ -782,28 +738,6 @@
                OpDecorate %6 DescriptorSet 1
                OpDecorate %6 Binding 2
                OpDecorate %6 NonWritable
-               OpMemberDecorate %tint_ExternalTextureParams 0 Offset 0
-               OpMemberDecorate %tint_ExternalTextureParams 1 Offset 4
-               OpMemberDecorate %tint_ExternalTextureParams 2 Offset 16
-               OpMemberDecorate %tint_ExternalTextureParams 2 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 2 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 3 Offset 64
-               OpMemberDecorate %tint_ExternalTextureParams 4 Offset 96
-               OpMemberDecorate %tint_ExternalTextureParams 5 Offset 128
-               OpMemberDecorate %tint_ExternalTextureParams 5 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 5 MatrixStride 16
-               OpMemberDecorate %tint_ExternalTextureParams 6 Offset 176
-               OpMemberDecorate %tint_ExternalTextureParams 6 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 6 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 7 Offset 200
-               OpMemberDecorate %tint_ExternalTextureParams 7 ColMajor
-               OpMemberDecorate %tint_ExternalTextureParams 7 MatrixStride 8
-               OpMemberDecorate %tint_ExternalTextureParams 8 Offset 224
-               OpMemberDecorate %tint_ExternalTextureParams 9 Offset 232
-               OpMemberDecorate %tint_ExternalTextureParams 10 Offset 240
-               OpMemberDecorate %tint_ExternalTextureParams 11 Offset 248
-               OpMemberDecorate %tint_ExternalTextureParams 12 Offset 256
-               OpMemberDecorate %tint_ExternalTextureParams 13 Offset 264
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.spvasm b/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.spvasm
index e70b5ab..5d7c737 100644
--- a/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.spvasm
+++ b/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.spvasm
@@ -27,7 +27,6 @@
                OpDecorate %arg_0 Binding 0
                OpDecorate %vertex_main_position_Output BuiltIn Position
                OpDecorate %vertex_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %vertex_main_out 0 Offset 0
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 1 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
diff --git a/test/tint/builtins/workgroupUniformLoad/array.wgsl.expected.spvasm b/test/tint/builtins/workgroupUniformLoad/array.wgsl.expected.spvasm
index 1a22285..5014802 100644
--- a/test/tint/builtins/workgroupUniformLoad/array.wgsl.expected.spvasm
+++ b/test/tint/builtins/workgroupUniformLoad/array.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %v "v"
                OpName %foo "foo"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.spvasm b/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.spvasm
index 14d6bc0..c1e0b7f 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.spvasm
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %v "v"
                OpName %foo "foo"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_128 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
    %uint_128 = OpConstant %uint 128
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.spvasm b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.spvasm
index 14d6bc0..c1e0b7f 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.spvasm
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %v "v"
                OpName %foo "foo"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_128 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
    %uint_128 = OpConstant %uint 128
diff --git a/test/tint/builtins/workgroupUniformLoad/structures.wgsl.expected.spvasm b/test/tint/builtins/workgroupUniformLoad/structures.wgsl.expected.spvasm
index cc31e3d..61a3e38 100644
--- a/test/tint/builtins/workgroupUniformLoad/structures.wgsl.expected.spvasm
+++ b/test/tint/builtins/workgroupUniformLoad/structures.wgsl.expected.spvasm
@@ -16,13 +16,6 @@
                OpName %v "v"
                OpName %foo "foo"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %Inner 0 Offset 0
-               OpMemberDecorate %Inner 1 Offset 16
-               OpMemberDecorate %Inner 2 Offset 32
-               OpMemberDecorate %Inner 2 ColMajor
-               OpMemberDecorate %Inner 2 MatrixStride 16
-               OpDecorate %_arr_Inner_uint_4 ArrayStride 80
-               OpMemberDecorate %Outer 0 Offset 0
        %bool = OpTypeBool
         %int = OpTypeInt 32 1
       %v4int = OpTypeVector %int 4
diff --git a/test/tint/builtins/workgroupUniformLoad/via_param.wgsl.expected.spvasm b/test/tint/builtins/workgroupUniformLoad/via_param.wgsl.expected.spvasm
index c62a013..3fc8d20 100644
--- a/test/tint/builtins/workgroupUniformLoad/via_param.wgsl.expected.spvasm
+++ b/test/tint/builtins/workgroupUniformLoad/via_param.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %p_indices "p_indices"
                OpName %bar "bar"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/const/global/global.wgsl.expected.spvasm b/test/tint/const/global/global.wgsl.expected.spvasm
index ccabc72..d5b902c 100644
--- a/test/tint/const/global/global.wgsl.expected.spvasm
+++ b/test/tint/const/global/global.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpName %v9 "v9"
                OpName %main "main"
                OpDecorate %main_loc0_Output Location 0
-               OpDecorate %_arr_float_uint_10 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/expressions/index/let/array_nested_struct.wgsl.expected.spvasm b/test/tint/expressions/index/let/array_nested_struct.wgsl.expected.spvasm
index 65cd4f3..dc64bb6 100644
--- a/test/tint/expressions/index/let/array_nested_struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/array_nested_struct.wgsl.expected.spvasm
@@ -13,10 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
-               OpMemberDecorate %S 1 Offset 4
-               OpDecorate %_arr_S_uint_2 ArrayStride 20
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/let/literal/array.wgsl.expected.spvasm b/test/tint/expressions/index/let/let/literal/array.wgsl.expected.spvasm
index 53cad17..0e99084 100644
--- a/test/tint/expressions/index/let/let/literal/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/let/literal/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %a "a"
                OpName %i "i"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/let/let/param/array.wgsl.expected.spvasm b/test/tint/expressions/index/let/let/param/array.wgsl.expected.spvasm
index 0e434fc..eccb425 100644
--- a/test/tint/expressions/index/let/let/param/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/let/param/array.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %a "a"
                OpName %x "i"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %4 = OpTypeFunction %int %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/let/literal/array.wgsl.expected.spvasm b/test/tint/expressions/index/let/literal/array.wgsl.expected.spvasm
index 911a970..fe63cac 100644
--- a/test/tint/expressions/index/let/literal/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/literal/array.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/let/param/array.wgsl.expected.spvasm b/test/tint/expressions/index/let/param/array.wgsl.expected.spvasm
index 02847c4..6bd709a 100644
--- a/test/tint/expressions/index/let/param/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/param/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %i "i"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %4 = OpTypeFunction %int %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/let/struct.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct.wgsl.expected.spvasm
index e2817d9..80c722e 100644
--- a/test/tint/expressions/index/let/struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/struct_nested_array.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct_nested_array.wgsl.expected.spvasm
index c2c9b3c..b9859ab 100644
--- a/test/tint/expressions/index/let/struct_nested_array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct_nested_array.wgsl.expected.spvasm
@@ -13,9 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/struct_nested_multiple.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct_nested_multiple.wgsl.expected.spvasm
index a6d218b..2217029 100644
--- a/test/tint/expressions/index/let/struct_nested_multiple.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct_nested_multiple.wgsl.expected.spvasm
@@ -15,11 +15,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
-               OpMemberDecorate %T 0 Offset 0
-               OpDecorate %_arr_T_uint_4 ArrayStride 8
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/struct_nested_struct.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct_nested_struct.wgsl.expected.spvasm
index 6e05e64..c6a93f0 100644
--- a/test/tint/expressions/index/let/struct_nested_struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct_nested_struct.wgsl.expected.spvasm
@@ -16,10 +16,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %T 0 Offset 0
-               OpMemberDecorate %T 1 Offset 4
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/struct_with_matrix.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct_with_matrix.wgsl.expected.spvasm
index 4ae7c5b..6ed8e31 100644
--- a/test/tint/expressions/index/let/struct_with_matrix.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct_with_matrix.wgsl.expected.spvasm
@@ -13,10 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
       %float = OpTypeFloat 32
           %3 = OpTypeFunction %float
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/struct_with_vector.wgsl.expected.spvasm b/test/tint/expressions/index/let/struct_with_vector.wgsl.expected.spvasm
index c55f943..e42f15e 100644
--- a/test/tint/expressions/index/let/struct_with_vector.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/struct_with_vector.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/let/var/literal/array.wgsl.expected.spvasm b/test/tint/expressions/index/let/var/literal/array.wgsl.expected.spvasm
index 634eab6..f507d18 100644
--- a/test/tint/expressions/index/let/var/literal/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/let/var/literal/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %a "a"
                OpName %i "i"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/var/array_nested_struct.wgsl.expected.spvasm b/test/tint/expressions/index/var/array_nested_struct.wgsl.expected.spvasm
index f8dcd74..e32918b 100644
--- a/test/tint/expressions/index/var/array_nested_struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/array_nested_struct.wgsl.expected.spvasm
@@ -13,10 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
-               OpMemberDecorate %S 1 Offset 4
-               OpDecorate %_arr_S_uint_2 ArrayStride 20
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/let/literal/array.wgsl.expected.spvasm b/test/tint/expressions/index/var/let/literal/array.wgsl.expected.spvasm
index 8bcf5e9..01a138a 100644
--- a/test/tint/expressions/index/var/let/literal/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/let/literal/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %a "a"
                OpName %i "i"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/var/let/param/array.wgsl.expected.spvasm b/test/tint/expressions/index/var/let/param/array.wgsl.expected.spvasm
index d38bfdf..9c6035d 100644
--- a/test/tint/expressions/index/var/let/param/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/let/param/array.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %a "a"
                OpName %x "i"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %4 = OpTypeFunction %int %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/var/literal/array.wgsl.expected.spvasm b/test/tint/expressions/index/var/literal/array.wgsl.expected.spvasm
index 9a3b4e6..6837637 100644
--- a/test/tint/expressions/index/var/literal/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/literal/array.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %3 = OpTypeFunction %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/var/param/array.wgsl.expected.spvasm b/test/tint/expressions/index/var/param/array.wgsl.expected.spvasm
index eeca5bc..89294c6 100644
--- a/test/tint/expressions/index/var/param/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/param/array.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %i "i"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_8 ArrayStride 4
         %int = OpTypeInt 32 1
           %4 = OpTypeFunction %int %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/index/var/struct.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct.wgsl.expected.spvasm
index 4570b7b..41b0c6f 100644
--- a/test/tint/expressions/index/var/struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/struct_nested_array.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct_nested_array.wgsl.expected.spvasm
index 6d15c16..aa62b0f 100644
--- a/test/tint/expressions/index/var/struct_nested_array.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct_nested_array.wgsl.expected.spvasm
@@ -13,9 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/struct_nested_multiple.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct_nested_multiple.wgsl.expected.spvasm
index fbab1ca..7acb063 100644
--- a/test/tint/expressions/index/var/struct_nested_multiple.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct_nested_multiple.wgsl.expected.spvasm
@@ -15,11 +15,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
-               OpMemberDecorate %T 0 Offset 0
-               OpDecorate %_arr_T_uint_4 ArrayStride 8
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/struct_nested_struct.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct_nested_struct.wgsl.expected.spvasm
index 8734f8b..d437fb0 100644
--- a/test/tint/expressions/index/var/struct_nested_struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct_nested_struct.wgsl.expected.spvasm
@@ -16,10 +16,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %T 0 Offset 0
-               OpMemberDecorate %T 1 Offset 4
-               OpMemberDecorate %S 1 Offset 4
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/struct_with_matrix.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct_with_matrix.wgsl.expected.spvasm
index 0a9aaee..321829f 100644
--- a/test/tint/expressions/index/var/struct_with_matrix.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct_with_matrix.wgsl.expected.spvasm
@@ -13,10 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
-               OpMemberDecorate %S 1 ColMajor
-               OpMemberDecorate %S 1 MatrixStride 16
       %float = OpTypeFloat 32
           %3 = OpTypeFunction %float
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/index/var/struct_with_vector.wgsl.expected.spvasm b/test/tint/expressions/index/var/struct_with_vector.wgsl.expected.spvasm
index afca173..bc8ec06 100644
--- a/test/tint/expressions/index/var/struct_with_vector.wgsl.expected.spvasm
+++ b/test/tint/expressions/index/var/struct_with_vector.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %S "S"
                OpName %a "a"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 16
        %uint = OpTypeInt 32 0
           %3 = OpTypeFunction %uint
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/swizzle/read/swizzle.wgsl.expected.spvasm b/test/tint/expressions/swizzle/read/swizzle.wgsl.expected.spvasm
index ffc993b..31c634f 100644
--- a/test/tint/expressions/swizzle/read/swizzle.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/swizzle.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %d "d"
                OpName %e "e"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v3float_uint_3 ArrayStride 16
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/swizzle/read/vec3/f16.wgsl.expected.spvasm b/test/tint/expressions/swizzle/read/vec3/f16.wgsl.expected.spvasm
index 7241738..c4abf6e 100644
--- a/test/tint/expressions/swizzle/read/vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/vec3/f16.wgsl.expected.spvasm
@@ -136,7 +136,6 @@
                OpName %zzzy "zzzy"
                OpName %zzzz "zzzz"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
           %S = OpTypeStruct %v3half
diff --git a/test/tint/expressions/swizzle/read/vec3/f32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/read/vec3/f32.wgsl.expected.spvasm
index 20ab095..763770a 100644
--- a/test/tint/expressions/swizzle/read/vec3/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/vec3/f32.wgsl.expected.spvasm
@@ -133,7 +133,6 @@
                OpName %zzzy "zzzy"
                OpName %zzzz "zzzz"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
           %S = OpTypeStruct %v3float
diff --git a/test/tint/expressions/swizzle/read/vec3/i32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/read/vec3/i32.wgsl.expected.spvasm
index a2285ef..fe964be 100644
--- a/test/tint/expressions/swizzle/read/vec3/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/vec3/i32.wgsl.expected.spvasm
@@ -133,7 +133,6 @@
                OpName %zzzy "zzzy"
                OpName %zzzz "zzzz"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
       %v3int = OpTypeVector %int 3
           %S = OpTypeStruct %v3int
diff --git a/test/tint/expressions/swizzle/read/vec3/u32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/read/vec3/u32.wgsl.expected.spvasm
index 8a99893..8491d9c 100644
--- a/test/tint/expressions/swizzle/read/vec3/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/vec3/u32.wgsl.expected.spvasm
@@ -133,7 +133,6 @@
                OpName %zzzy "zzzy"
                OpName %zzzz "zzzz"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
        %uint = OpTypeInt 32 0
      %v3uint = OpTypeVector %uint 3
           %S = OpTypeStruct %v3uint
diff --git a/test/tint/expressions/swizzle/write/swizzle.wgsl.expected.spvasm b/test/tint/expressions/swizzle/write/swizzle.wgsl.expected.spvasm
index cd1bcca..d7ca9af 100644
--- a/test/tint/expressions/swizzle/write/swizzle.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/swizzle.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %S "S"
                OpName %d "d"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v3float_uint_3 ArrayStride 16
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/swizzle/write/vec3/f16.wgsl.expected.spvasm b/test/tint/expressions/swizzle/write/vec3/f16.wgsl.expected.spvasm
index 1e5c1ed..a9fd208 100644
--- a/test/tint/expressions/swizzle/write/vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/vec3/f16.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %P "P"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
        %half = OpTypeFloat 16
      %v3half = OpTypeVector %half 3
           %S = OpTypeStruct %v3half
diff --git a/test/tint/expressions/swizzle/write/vec3/f32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/write/vec3/f32.wgsl.expected.spvasm
index 7370273..ebd25cf 100644
--- a/test/tint/expressions/swizzle/write/vec3/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/vec3/f32.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %P "P"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
       %float = OpTypeFloat 32
     %v3float = OpTypeVector %float 3
           %S = OpTypeStruct %v3float
diff --git a/test/tint/expressions/swizzle/write/vec3/i32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/write/vec3/i32.wgsl.expected.spvasm
index d6e4a48..4abc8bb 100644
--- a/test/tint/expressions/swizzle/write/vec3/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/vec3/i32.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %P "P"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
       %v3int = OpTypeVector %int 3
           %S = OpTypeStruct %v3int
diff --git a/test/tint/expressions/swizzle/write/vec3/u32.wgsl.expected.spvasm b/test/tint/expressions/swizzle/write/vec3/u32.wgsl.expected.spvasm
index 3a7a647..b16c92c 100644
--- a/test/tint/expressions/swizzle/write/vec3/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/vec3/u32.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %P "P"
                OpName %f "f"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
        %uint = OpTypeInt 32 0
      %v3uint = OpTypeVector %uint 3
           %S = OpTypeStruct %v3uint
diff --git a/test/tint/expressions/type_ctor/array/explicit/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/abstract.wgsl.expected.spvasm
index b9eaa67..ae8cae0 100644
--- a/test/tint/expressions/type_ctor/array/explicit/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/array/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/array/abstract.wgsl.expected.spvasm
index 27f01a9..dc59458 100644
--- a/test/tint/expressions/type_ctor/array/explicit/array/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/array/abstract.wgsl.expected.spvasm
@@ -11,8 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_2_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/array/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/array/f32.wgsl.expected.spvasm
index 27f01a9..dc59458 100644
--- a/test/tint/expressions/type_ctor/array/explicit/array/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/array/f32.wgsl.expected.spvasm
@@ -11,8 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_2_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/f32.wgsl.expected.spvasm
index b9eaa67..ae8cae0 100644
--- a/test/tint/expressions/type_ctor/array/explicit/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/i32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/i32.wgsl.expected.spvasm
index 6f41e3c..f6e5714 100644
--- a/test/tint/expressions/type_ctor/array/explicit/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/i32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/mat2x2/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/mat2x2/abstract.wgsl.expected.spvasm
index 98cb1cf..5d6ee15 100644
--- a/test/tint/expressions/type_ctor/array/explicit/mat2x2/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/mat2x2/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_mat2v2float_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/mat2x2/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/mat2x2/f32.wgsl.expected.spvasm
index 98cb1cf..5d6ee15 100644
--- a/test/tint/expressions/type_ctor/array/explicit/mat2x2/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/mat2x2/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_mat2v2float_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/expressions/type_ctor/array/explicit/u32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/u32.wgsl.expected.spvasm
index 7f33052..cf7c290 100644
--- a/test/tint/expressions/type_ctor/array/explicit/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/u32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
 %_arr_uint_uint_2 = OpTypeArray %uint %uint_2
diff --git a/test/tint/expressions/type_ctor/array/explicit/vec2/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/vec2/abstract.wgsl.expected.spvasm
index 36cc808..0415321 100644
--- a/test/tint/expressions/type_ctor/array/explicit/vec2/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/vec2/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2float_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/explicit/vec2/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/vec2/f32.wgsl.expected.spvasm
index 36cc808..0415321 100644
--- a/test/tint/expressions/type_ctor/array/explicit/vec2/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/vec2/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2float_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/explicit/vec2/i32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/vec2/i32.wgsl.expected.spvasm
index fb8c1b8..0b6eb63 100644
--- a/test/tint/expressions/type_ctor/array/explicit/vec2/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/vec2/i32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2int_uint_2 ArrayStride 8
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/explicit/vec2/u32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/explicit/vec2/u32.wgsl.expected.spvasm
index ffb08ae..6f8d05b 100644
--- a/test/tint/expressions/type_ctor/array/explicit/vec2/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/explicit/vec2/u32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2uint_uint_2 ArrayStride 8
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/abstract.wgsl.expected.spvasm
index 6f41e3c..f6e5714 100644
--- a/test/tint/expressions/type_ctor/array/inferred/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/array/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/array/abstract.wgsl.expected.spvasm
index e903b29d..0d34c46 100644
--- a/test/tint/expressions/type_ctor/array/inferred/array/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/array/abstract.wgsl.expected.spvasm
@@ -11,8 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_2_uint_2 ArrayStride 8
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/array/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/array/f32.wgsl.expected.spvasm
index 27f01a9..dc59458 100644
--- a/test/tint/expressions/type_ctor/array/inferred/array/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/array/f32.wgsl.expected.spvasm
@@ -11,8 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
-               OpDecorate %_arr__arr_float_uint_2_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/f32.wgsl.expected.spvasm
index b9eaa67..ae8cae0 100644
--- a/test/tint/expressions/type_ctor/array/inferred/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/i32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/i32.wgsl.expected.spvasm
index 6f41e3c..f6e5714 100644
--- a/test/tint/expressions/type_ctor/array/inferred/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/i32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/mat2x2/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/mat2x2/abstract.wgsl.expected.spvasm
index 98cb1cf..5d6ee15 100644
--- a/test/tint/expressions/type_ctor/array/inferred/mat2x2/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/mat2x2/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_mat2v2float_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/mat2x2/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/mat2x2/f32.wgsl.expected.spvasm
index 98cb1cf..5d6ee15 100644
--- a/test/tint/expressions/type_ctor/array/inferred/mat2x2/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/mat2x2/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_mat2v2float_uint_2 ArrayStride 16
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/expressions/type_ctor/array/inferred/u32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/u32.wgsl.expected.spvasm
index 7f33052..cf7c290 100644
--- a/test/tint/expressions/type_ctor/array/inferred/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/u32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_uint_uint_2 ArrayStride 4
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
 %_arr_uint_uint_2 = OpTypeArray %uint %uint_2
diff --git a/test/tint/expressions/type_ctor/array/inferred/vec2/abstract.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/vec2/abstract.wgsl.expected.spvasm
index 36cc808..0415321 100644
--- a/test/tint/expressions/type_ctor/array/inferred/vec2/abstract.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/vec2/abstract.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2float_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/inferred/vec2/f32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/vec2/f32.wgsl.expected.spvasm
index 36cc808..0415321 100644
--- a/test/tint/expressions/type_ctor/array/inferred/vec2/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/vec2/f32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2float_uint_2 ArrayStride 8
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/inferred/vec2/i32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/vec2/i32.wgsl.expected.spvasm
index fb8c1b8..0b6eb63 100644
--- a/test/tint/expressions/type_ctor/array/inferred/vec2/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/vec2/i32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2int_uint_2 ArrayStride 8
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/type_ctor/array/inferred/vec2/u32.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/array/inferred/vec2/u32.wgsl.expected.spvasm
index ffb08ae..6f8d05b 100644
--- a/test/tint/expressions/type_ctor/array/inferred/vec2/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/type_ctor/array/inferred/vec2/u32.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v2uint_uint_2 ArrayStride 8
        %uint = OpTypeInt 32 0
      %v2uint = OpTypeVector %uint 2
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/expressions/zero_init/array/bool.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/bool.wgsl.expected.spvasm
index 4882cf3..0be27df 100644
--- a/test/tint/expressions/zero_init/array/bool.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/bool.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_bool_uint_4 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/expressions/zero_init/array/f16.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/f16.wgsl.expected.spvasm
index 861385b..16e75d8 100644
--- a/test/tint/expressions/zero_init/array/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/f16.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_half_uint_4 ArrayStride 2
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %half = OpTypeFloat 16
diff --git a/test/tint/expressions/zero_init/array/f32.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/f32.wgsl.expected.spvasm
index 0f56cb2..9f029fe 100644
--- a/test/tint/expressions/zero_init/array/f32.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/f32.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/expressions/zero_init/array/i32.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/i32.wgsl.expected.spvasm
index f54a92f..8ef21a7 100644
--- a/test/tint/expressions/zero_init/array/i32.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/i32.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/zero_init/array/struct.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/struct.wgsl.expected.spvasm
index 4c23e05..8cc371a 100644
--- a/test/tint/expressions/zero_init/array/struct.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/struct.wgsl.expected.spvasm
@@ -15,11 +15,6 @@
                OpName %S "S"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
-               OpMemberDecorate %S 3 Offset 12
-               OpDecorate %_arr_S_uint_4 ArrayStride 16
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/expressions/zero_init/array/u32.wgsl.expected.spvasm b/test/tint/expressions/zero_init/array/u32.wgsl.expected.spvasm
index 0598947..9faf2d3 100644
--- a/test/tint/expressions/zero_init/array/u32.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/array/u32.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %f "f"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_uint_uint_4 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %uint = OpTypeInt 32 0
diff --git a/test/tint/expressions/zero_init/struct/array.wgsl.expected.spvasm b/test/tint/expressions/zero_init/struct/array.wgsl.expected.spvasm
index b1167e0..d7d3e0a 100644
--- a/test/tint/expressions/zero_init/struct/array.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/struct/array.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %S "S"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/expressions/zero_init/struct/scalar.wgsl.expected.spvasm b/test/tint/expressions/zero_init/struct/scalar.wgsl.expected.spvasm
index bb7b454..48fe6b6 100644
--- a/test/tint/expressions/zero_init/struct/scalar.wgsl.expected.spvasm
+++ b/test/tint/expressions/zero_init/struct/scalar.wgsl.expected.spvasm
@@ -15,10 +15,6 @@
                OpName %S "S"
                OpName %v "v"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
-               OpMemberDecorate %S 3 Offset 12
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_1.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_1.wgsl.expected.spvasm
index 923ce14..e52f1e8 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_1.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_1.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_1 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_1 = OpConstant %uint 1
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_2.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_2.wgsl.expected.spvasm
index d34755c..c9468f9 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_2.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_2.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_2 = OpConstant %uint 2
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_3.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_3.wgsl.expected.spvasm
index c835ca6..e7a86d8 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_3.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_3.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_3 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_3 = OpConstant %uint 3
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_4.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_4.wgsl.expected.spvasm
index 923b3fe..04f1a1a 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_4.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_4.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_5.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_5.wgsl.expected.spvasm
index 075b38c..35e9125 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_5.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_5.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_5 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 32
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_5 = OpConstant %uint 5
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_6.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_6.wgsl.expected.spvasm
index 06011a8..77a4f73 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_6.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_6.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_6 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 32
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_6 = OpConstant %uint 6
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_7.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_7.wgsl.expected.spvasm
index 88680e9..b85ba7e 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_7.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_7.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_7 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 32
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_7 = OpConstant %uint 7
diff --git a/test/tint/extensions/clip_distances/first_member/clip_distances_size_8.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/first_member/clip_distances_size_8.wgsl.expected.spvasm
index 0baffd8..4178995 100644
--- a/test/tint/extensions/clip_distances/first_member/clip_distances_size_8.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/first_member/clip_distances_size_8.wgsl.expected.spvasm
@@ -15,12 +15,9 @@
                OpMemberName %VertexOutputs 1 "position"
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_8 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 32
       %float = OpTypeFloat 32
        %uint = OpTypeInt 32 0
      %uint_8 = OpConstant %uint 8
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_1.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_1.wgsl.expected.spvasm
index b1e2974..89cac89 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_1.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_1.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_1 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_2.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_2.wgsl.expected.spvasm
index 49f5945..46f3195 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_2.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_2.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_2 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_3.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_3.wgsl.expected.spvasm
index 332d70c..f51ebd2 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_3.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_3.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_3 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_4.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_4.wgsl.expected.spvasm
index 34a09e1..cebc5f4 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_4.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_4.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_5.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_5.wgsl.expected.spvasm
index 13e668e..bbbbecc 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_5.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_5.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_5 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_6.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_6.wgsl.expected.spvasm
index baf336e..9e859b0 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_6.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_6.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_6 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_7.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_7.wgsl.expected.spvasm
index a340d45..c5d3506 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_7.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_7.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_7 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/clip_distances/last_member/clip_distances_size_8.wgsl.expected.spvasm b/test/tint/extensions/clip_distances/last_member/clip_distances_size_8.wgsl.expected.spvasm
index d0264f1..b20373a 100644
--- a/test/tint/extensions/clip_distances/last_member/clip_distances_size_8.wgsl.expected.spvasm
+++ b/test/tint/extensions/clip_distances/last_member/clip_distances_size_8.wgsl.expected.spvasm
@@ -16,11 +16,8 @@
                OpName %VertexOutputs "VertexOutputs"
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
-               OpDecorate %_arr_float_uint_8 ArrayStride 4
                OpDecorate %main_clip_distances_Output BuiltIn ClipDistance
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.spvasm b/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.spvasm
index 3afaa6a..766ea9c 100644
--- a/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.spvasm
+++ b/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.spvasm
@@ -27,10 +27,6 @@
                OpDecorate %frag_main_loc0_idx0_Output Index 0
                OpDecorate %frag_main_loc0_idx1_Output Location 0
                OpDecorate %frag_main_loc0_idx1_Output Index 1
-               OpMemberDecorate %FragOutput 0 Offset 0
-               OpMemberDecorate %FragOutput 1 Offset 16
-               OpMemberDecorate %FragInput 0 Offset 0
-               OpMemberDecorate %FragInput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Input_v4float = OpTypePointer Input %v4float
diff --git a/test/tint/extensions/dual_source_blending/output.wgsl.expected.spvasm b/test/tint/extensions/dual_source_blending/output.wgsl.expected.spvasm
index 69f0820..ec60afd 100644
--- a/test/tint/extensions/dual_source_blending/output.wgsl.expected.spvasm
+++ b/test/tint/extensions/dual_source_blending/output.wgsl.expected.spvasm
@@ -19,8 +19,6 @@
                OpDecorate %frag_main_loc0_idx0_Output Index 0
                OpDecorate %frag_main_loc0_idx1_Output Location 0
                OpDecorate %frag_main_loc0_idx1_Output Index 1
-               OpMemberDecorate %FragOutput 0 Offset 0
-               OpMemberDecorate %FragOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/identifiers/underscore/double/struct.wgsl.expected.spvasm b/test/tint/identifiers/underscore/double/struct.wgsl.expected.spvasm
index 78fa95c..088b54b 100644
--- a/test/tint/identifiers/underscore/double/struct.wgsl.expected.spvasm
+++ b/test/tint/identifiers/underscore/double/struct.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %a__ 0 Offset 0
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/identifiers/underscore/prefix/lower/struct.wgsl.expected.spvasm b/test/tint/identifiers/underscore/prefix/lower/struct.wgsl.expected.spvasm
index 56efa76..eaf63b5 100644
--- a/test/tint/identifiers/underscore/prefix/lower/struct.wgsl.expected.spvasm
+++ b/test/tint/identifiers/underscore/prefix/lower/struct.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %_a 0 Offset 0
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/identifiers/underscore/prefix/upper/struct.wgsl.expected.spvasm b/test/tint/identifiers/underscore/prefix/upper/struct.wgsl.expected.spvasm
index cd3a31a..e3776b6 100644
--- a/test/tint/identifiers/underscore/prefix/upper/struct.wgsl.expected.spvasm
+++ b/test/tint/identifiers/underscore/prefix/upper/struct.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %_A 0 Offset 0
         %int = OpTypeInt 32 1
     %s_block = OpTypeStruct %int
 %_ptr_StorageBuffer_s_block = OpTypePointer StorageBuffer %s_block
diff --git a/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.spvasm b/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.spvasm
index 803af47..b91ee58 100644
--- a/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.spvasm
+++ b/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.spvasm
@@ -32,7 +32,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %strided_arr = OpTypeStruct %v2float
diff --git a/test/tint/out_of_order_decls/alias/struct.wgsl.expected.spvasm b/test/tint/out_of_order_decls/alias/struct.wgsl.expected.spvasm
index 43a1b5b..895c056 100644
--- a/test/tint/out_of_order_decls/alias/struct.wgsl.expected.spvasm
+++ b/test/tint/out_of_order_decls/alias/struct.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpMemberName %S 0 "m"
                OpName %S "S"
                OpName %v "v"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/out_of_order_decls/array/alias.wgsl.expected.spvasm b/test/tint/out_of_order_decls/array/alias.wgsl.expected.spvasm
index a244c58..54ef994 100644
--- a/test/tint/out_of_order_decls/array/alias.wgsl.expected.spvasm
+++ b/test/tint/out_of_order_decls/array/alias.wgsl.expected.spvasm
@@ -9,7 +9,6 @@
                OpExecutionMode %f OriginUpperLeft
                OpName %A "A"
                OpName %f "f"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/out_of_order_decls/array/struct.wgsl.expected.spvasm b/test/tint/out_of_order_decls/array/struct.wgsl.expected.spvasm
index 04c59cd..dbadb8e 100644
--- a/test/tint/out_of_order_decls/array/struct.wgsl.expected.spvasm
+++ b/test/tint/out_of_order_decls/array/struct.wgsl.expected.spvasm
@@ -11,8 +11,6 @@
                OpName %S "S"
                OpName %A "A"
                OpName %f "f"
-               OpMemberDecorate %S 0 Offset 0
-               OpDecorate %_arr_S_uint_4 ArrayStride 4
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/out_of_order_decls/struct/alias.wgsl.expected.spvasm b/test/tint/out_of_order_decls/struct/alias.wgsl.expected.spvasm
index 43a1b5b..895c056 100644
--- a/test/tint/out_of_order_decls/struct/alias.wgsl.expected.spvasm
+++ b/test/tint/out_of_order_decls/struct/alias.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpMemberName %S 0 "m"
                OpName %S "S"
                OpName %v "v"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/out_of_order_decls/struct/struct.wgsl.expected.spvasm b/test/tint/out_of_order_decls/struct/struct.wgsl.expected.spvasm
index b5983c7..b6f57a6 100644
--- a/test/tint/out_of_order_decls/struct/struct.wgsl.expected.spvasm
+++ b/test/tint/out_of_order_decls/struct/struct.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpMemberName %S1 0 "m"
                OpName %S1 "S1"
                OpName %v "v"
-               OpMemberDecorate %S2 0 Offset 0
-               OpMemberDecorate %S1 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/ptr_ref/load/global/struct_field.spvasm.expected.spvasm b/test/tint/ptr_ref/load/global/struct_field.spvasm.expected.spvasm
index 86b952a..9315999 100644
--- a/test/tint/ptr_ref/load/global/struct_field.spvasm.expected.spvasm
+++ b/test/tint/ptr_ref/load/global/struct_field.spvasm.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %main_1 "main_1"
                OpName %i "i"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
 %_ptr_Private_S = OpTypePointer Private %S
diff --git a/test/tint/ptr_ref/load/global/struct_field.wgsl.expected.spvasm b/test/tint/ptr_ref/load/global/struct_field.wgsl.expected.spvasm
index b51e568..7f07e6b 100644
--- a/test/tint/ptr_ref/load/global/struct_field.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/global/struct_field.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %V "V"
                OpName %main "main"
                OpName %i "i"
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
 %_ptr_Private_S = OpTypePointer Private %S
diff --git a/test/tint/ptr_ref/load/local/struct_field.spvasm.expected.spvasm b/test/tint/ptr_ref/load/local/struct_field.spvasm.expected.spvasm
index 0eb64b2..eecce93 100644
--- a/test/tint/ptr_ref/load/local/struct_field.spvasm.expected.spvasm
+++ b/test/tint/ptr_ref/load/local/struct_field.spvasm.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %S "S"
                OpName %V "V"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/ptr_ref/load/local/struct_field.wgsl.expected.spvasm b/test/tint/ptr_ref/load/local/struct_field.wgsl.expected.spvasm
index 177eb08..10e1024 100644
--- a/test/tint/ptr_ref/load/local/struct_field.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/local/struct_field.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %S "S"
                OpName %V "V"
                OpName %i "i"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/ptr_ref/load/param/function/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/array_in_struct.wgsl.expected.spvasm
index 735fcb9..7da20ab 100644
--- a/test/tint/ptr_ref/load/param/function/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/array_in_struct.wgsl.expected.spvasm
@@ -14,8 +14,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/ptr_ref/load/param/function/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/i32_in_struct.wgsl.expected.spvasm
index 06b3419..dfe0571 100644
--- a/test/tint/ptr_ref/load/param/function/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/i32_in_struct.wgsl.expected.spvasm
@@ -14,7 +14,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
 %_ptr_Function_str = OpTypePointer Function %str
diff --git a/test/tint/ptr_ref/load/param/function/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/struct_in_array.wgsl.expected.spvasm
index 7005d45..3cb97ec 100644
--- a/test/tint/ptr_ref/load/param/function/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/struct_in_array.wgsl.expected.spvasm
@@ -15,9 +15,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/load/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index 56d6069..a32aeb2 100644
--- a/test/tint/ptr_ref/load/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/load/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index e4837b0..cefc6d6 100644
--- a/test/tint/ptr_ref/load/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/load/param/function/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
index d37d6bc..79643aa 100644
--- a/test/tint/ptr_ref/load/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -14,7 +14,6 @@
                OpName %main "main"
                OpName %F "F"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
         %str = OpTypeStruct %v4float
diff --git a/test/tint/ptr_ref/load/param/private/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/array_in_struct.wgsl.expected.spvasm
index b542422..0371ea8 100644
--- a/test/tint/ptr_ref/load/param/private/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/array_in_struct.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %func "func"
                OpName %main "main"
                OpName %r "r"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/ptr_ref/load/param/private/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/i32_in_struct.wgsl.expected.spvasm
index 00023a7..f5f8ff6 100644
--- a/test/tint/ptr_ref/load/param/private/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/i32_in_struct.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %func "func"
                OpName %main "main"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
 %_ptr_Private_str = OpTypePointer Private %str
diff --git a/test/tint/ptr_ref/load/param/private/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/struct_in_array.wgsl.expected.spvasm
index 171caf0a..7d4dd36 100644
--- a/test/tint/ptr_ref/load/param/private/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/struct_in_array.wgsl.expected.spvasm
@@ -14,9 +14,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/load/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index b7da96e..3d50f2b 100644
--- a/test/tint/ptr_ref/load/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %r "r"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/load/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index f4c4395..3a9657e 100644
--- a/test/tint/ptr_ref/load/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %r "r"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/load/param/private/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
index b46426b..84da85c 100644
--- a/test/tint/ptr_ref/load/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %func "func"
                OpName %main "main"
                OpName %r "r"
-               OpMemberDecorate %str 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
         %str = OpTypeStruct %v4float
diff --git a/test/tint/ptr_ref/load/param/storage/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/storage/struct_in_array.wgsl.expected.spvasm
index 6860c96..0e15ae5 100644
--- a/test/tint/ptr_ref/load/param/storage/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/storage/struct_in_array.wgsl.expected.spvasm
@@ -22,7 +22,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/load/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index 9759888..ba7fe1f 100644
--- a/test/tint/ptr_ref/load/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -20,7 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/load/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index 23d8418..e8656e1 100644
--- a/test/tint/ptr_ref/load/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -20,7 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/load/param/uniform/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/uniform/struct_in_array.wgsl.expected.spvasm
index 7526dac..dbff48b 100644
--- a/test/tint/ptr_ref/load/param/uniform/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/uniform/struct_in_array.wgsl.expected.spvasm
@@ -22,7 +22,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
       %v4int = OpTypeVector %int 4
         %str = OpTypeStruct %v4int
diff --git a/test/tint/ptr_ref/load/param/uniform/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/uniform/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index c6fd004..e58e40d 100644
--- a/test/tint/ptr_ref/load/param/uniform/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/uniform/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -20,7 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %S_block_std140 = OpTypeStruct %v2float %v2float
diff --git a/test/tint/ptr_ref/load/param/uniform/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/uniform/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index 1858614..ee366a0 100644
--- a/test/tint/ptr_ref/load/param/uniform/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/uniform/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -20,7 +20,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.spvasm
index 263985f..1b447fc 100644
--- a/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.spvasm
@@ -16,8 +16,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %r "r"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.spvasm
index 219b820..933315f 100644
--- a/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %r "r"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
diff --git a/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.spvasm
index b87e52d..c65f153 100644
--- a/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.spvasm
@@ -17,10 +17,7 @@
                OpName %tint_local_index "tint_local_index"
                OpName %r "r"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index eee70a1..bd409a5 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %r "r"
                OpName %main "main"
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index efabffa..59db803 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %r "r"
                OpName %main "main"
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
index 8da5069..6be6003 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %r "r"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/ptr_ref/store/global/struct_field.spvasm.expected.spvasm b/test/tint/ptr_ref/store/global/struct_field.spvasm.expected.spvasm
index 312b323..cbd9bcb 100644
--- a/test/tint/ptr_ref/store/global/struct_field.spvasm.expected.spvasm
+++ b/test/tint/ptr_ref/store/global/struct_field.spvasm.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %V "V"
                OpName %main_1 "main_1"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
           %S = OpTypeStruct %int
 %_ptr_Private_S = OpTypePointer Private %S
diff --git a/test/tint/ptr_ref/store/local/struct_field.spvasm.expected.spvasm b/test/tint/ptr_ref/store/local/struct_field.spvasm.expected.spvasm
index ceaef51..6668d5f 100644
--- a/test/tint/ptr_ref/store/local/struct_field.spvasm.expected.spvasm
+++ b/test/tint/ptr_ref/store/local/struct_field.spvasm.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %S "S"
                OpName %V "V"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/ptr_ref/store/param/function/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/array_in_struct.wgsl.expected.spvasm
index e5ea817..bbdca2e 100644
--- a/test/tint/ptr_ref/store/param/function/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/array_in_struct.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %pointer_root "pointer_root"
                OpName %main "main"
                OpName %F "F"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
        %void = OpTypeVoid
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/store/param/function/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/i32_in_struct.wgsl.expected.spvasm
index a9dcd99..0c3dad9 100644
--- a/test/tint/ptr_ref/store/param/function/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/i32_in_struct.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %pointer_root "pointer_root"
                OpName %main "main"
                OpName %F "F"
-               OpMemberDecorate %str 0 Offset 0
        %void = OpTypeVoid
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
diff --git a/test/tint/ptr_ref/store/param/function/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/struct_in_array.wgsl.expected.spvasm
index ccf516c..7cb3194 100644
--- a/test/tint/ptr_ref/store/param/function/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/struct_in_array.wgsl.expected.spvasm
@@ -14,9 +14,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %F "F"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
        %void = OpTypeVoid
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
diff --git a/test/tint/ptr_ref/store/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index 01d7214..7d0b7ca 100644
--- a/test/tint/ptr_ref/store/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %F "F"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
        %void = OpTypeVoid
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
diff --git a/test/tint/ptr_ref/store/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index 0ab663a..c851c69 100644
--- a/test/tint/ptr_ref/store/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
                OpName %F "F"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
        %void = OpTypeVoid
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/ptr_ref/store/param/function/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
index a745d1a..d98dee1 100644
--- a/test/tint/ptr_ref/store/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/function/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %pointer_root "pointer_root"
                OpName %main "main"
                OpName %F "F"
-               OpMemberDecorate %str 0 Offset 0
        %void = OpTypeVoid
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/ptr_ref/store/param/private/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/array_in_struct.wgsl.expected.spvasm
index 5843214..60189ad 100644
--- a/test/tint/ptr_ref/store/param/private/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/array_in_struct.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %P "P"
                OpName %func "func"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_4 = OpConstant %uint 4
diff --git a/test/tint/ptr_ref/store/param/private/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/i32_in_struct.wgsl.expected.spvasm
index 9d92417..253faba 100644
--- a/test/tint/ptr_ref/store/param/private/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/i32_in_struct.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %P "P"
                OpName %func "func"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
 %_ptr_Private_str = OpTypePointer Private %str
diff --git a/test/tint/ptr_ref/store/param/private/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/struct_in_array.wgsl.expected.spvasm
index f1973e1..0d3cb11 100644
--- a/test/tint/ptr_ref/store/param/private/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/struct_in_array.wgsl.expected.spvasm
@@ -13,9 +13,6 @@
                OpName %func "func"
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/store/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index 7df1011..5e194ea 100644
--- a/test/tint/ptr_ref/store/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %func "func"
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/store/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index 83861e8..621f879 100644
--- a/test/tint/ptr_ref/store/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -11,7 +11,6 @@
                OpName %func "func"
                OpName %pointer_indices "pointer_indices"
                OpName %main "main"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/store/param/private/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
index 1595758..fb98985 100644
--- a/test/tint/ptr_ref/store/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/private/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %P "P"
                OpName %func "func"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
         %str = OpTypeStruct %v4float
diff --git a/test/tint/ptr_ref/store/param/storage/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/storage/struct_in_array.wgsl.expected.spvasm
index 9090f59..21933f9 100644
--- a/test/tint/ptr_ref/store/param/storage/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/storage/struct_in_array.wgsl.expected.spvasm
@@ -21,7 +21,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/store/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index dfe8b7d..e4dcd5a 100644
--- a/test/tint/ptr_ref/store/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/storage/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/store/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index d1bfb59..4250c91 100644
--- a/test/tint/ptr_ref/store/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/storage/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.spvasm
index 66d0476..f140ec6 100644
--- a/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.spvasm
@@ -15,8 +15,6 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_4 ArrayStride 4
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.spvasm
index eb41413..ad39911 100644
--- a/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
diff --git a/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.spvasm
index b0f6698..7433052 100644
--- a/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.spvasm
@@ -16,10 +16,7 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
-               OpDecorate %_arr_str_uint_4 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
         %int = OpTypeInt 32 1
         %str = OpTypeStruct %int
        %uint = OpTypeInt 32 0
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
index 31d289b..c45bccc 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
index 75ca6eb..18ffd6a 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat2v4float = OpTypeMatrix %v4float 2
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
index 43b75d0..38cf9bd 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpMemberDecorate %str 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/ptr_sugar/array.wgsl.expected.spvasm b/test/tint/ptr_sugar/array.wgsl.expected.spvasm
index f2fce3f..a9a62d1 100644
--- a/test/tint/ptr_sugar/array.wgsl.expected.spvasm
+++ b/test/tint/ptr_sugar/array.wgsl.expected.spvasm
@@ -37,7 +37,6 @@
                OpName %i_1 "i"
                OpName %b_4 "b"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_10 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/ptr_sugar/builtin_struct.wgsl.expected.spvasm b/test/tint/ptr_sugar/builtin_struct.wgsl.expected.spvasm
index 80976d5..03541ad 100644
--- a/test/tint/ptr_sugar/builtin_struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_sugar/builtin_struct.wgsl.expected.spvasm
@@ -34,10 +34,6 @@
                OpName %fract_2 "fract"
                OpName %exp_0 "exp"
                OpName %main "main"
-               OpMemberDecorate %__modf_result_f32 0 Offset 0
-               OpMemberDecorate %__modf_result_f32 1 Offset 4
-               OpMemberDecorate %__frexp_result_f32 0 Offset 0
-               OpMemberDecorate %__frexp_result_f32 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
       %float = OpTypeFloat 32
diff --git a/test/tint/ptr_sugar/struct.wgsl.expected.spvasm b/test/tint/ptr_sugar/struct.wgsl.expected.spvasm
index 107e666..c69c049 100644
--- a/test/tint/ptr_sugar/struct.wgsl.expected.spvasm
+++ b/test/tint/ptr_sugar/struct.wgsl.expected.spvasm
@@ -18,7 +18,6 @@
                OpName %a_0 "p"
                OpName %b_0 "b"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/samples/cube.wgsl.expected.spvasm b/test/tint/samples/cube.wgsl.expected.spvasm
index 0a89747..d9bb0d9 100644
--- a/test/tint/samples/cube.wgsl.expected.spvasm
+++ b/test/tint/samples/cube.wgsl.expected.spvasm
@@ -41,10 +41,6 @@
                OpDecorate %vtx_main_loc0_Output Location 0
                OpDecorate %vtx_main_position_Output BuiltIn Position
                OpDecorate %vtx_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
-               OpMemberDecorate %VertexInput 0 Offset 0
-               OpMemberDecorate %VertexInput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %mat4v4float = OpTypeMatrix %v4float 4
diff --git a/test/tint/samples/simple_vertex.spvasm.expected.spvasm b/test/tint/samples/simple_vertex.spvasm.expected.spvasm
index ccb3b07..e711a63 100644
--- a/test/tint/samples/simple_vertex.spvasm.expected.spvasm
+++ b/test/tint/samples/simple_vertex.spvasm.expected.spvasm
@@ -16,7 +16,6 @@
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %main_out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
diff --git a/test/tint/samples/triangle.wgsl.expected.spvasm b/test/tint/samples/triangle.wgsl.expected.spvasm
index fd88de9..be5efc8 100644
--- a/test/tint/samples/triangle.wgsl.expected.spvasm
+++ b/test/tint/samples/triangle.wgsl.expected.spvasm
@@ -19,7 +19,6 @@
                OpDecorate %vtx_main_vertex_index_Input BuiltIn VertexIndex
                OpDecorate %vtx_main_position_Output BuiltIn Position
                OpDecorate %vtx_main___point_size_Output BuiltIn PointSize
-               OpDecorate %_arr_v2float_uint_3 ArrayStride 8
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %vtx_main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/shadowing/function/var.wgsl.expected.spvasm b/test/tint/shadowing/function/var.wgsl.expected.spvasm
index b254209..89a7d6f 100644
--- a/test/tint/shadowing/function/var.wgsl.expected.spvasm
+++ b/test/tint/shadowing/function/var.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %a_1 "a"
                OpName %b_0 "b"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %a 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.spvasm b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.spvasm
index 59a5294..23be1b7 100644
--- a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.spvasm
+++ b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.spvasm
@@ -9,7 +9,6 @@
                OpDecorate %gl_VertexIndex BuiltIn VertexIndex
                OpDecorate %gl_Position BuiltIn Position
                OpDecorate %gl_PointSize BuiltIn PointSize
-               OpMemberDecorate %_struct_15 0 Offset 0
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %gl_VertexIndex = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/shadowing/struct/let.wgsl.expected.spvasm b/test/tint/shadowing/struct/let.wgsl.expected.spvasm
index 269ee1a..1cb992e 100644
--- a/test/tint/shadowing/struct/let.wgsl.expected.spvasm
+++ b/test/tint/shadowing/struct/let.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %a_0 "a"
                OpName %a_0 "b"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %a 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/shadowing/struct/param.wgsl.expected.spvasm b/test/tint/shadowing/struct/param.wgsl.expected.spvasm
index 856b915..bbe17df 100644
--- a/test/tint/shadowing/struct/param.wgsl.expected.spvasm
+++ b/test/tint/shadowing/struct/param.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %a_0 "a"
                OpName %a_0 "b"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %a 0 Offset 0
        %void = OpTypeVoid
         %int = OpTypeInt 32 1
           %a = OpTypeStruct %int
diff --git a/test/tint/shadowing/struct/var.wgsl.expected.spvasm b/test/tint/shadowing/struct/var.wgsl.expected.spvasm
index b254209..89a7d6f 100644
--- a/test/tint/shadowing/struct/var.wgsl.expected.spvasm
+++ b/test/tint/shadowing/struct/var.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpName %a_1 "a"
                OpName %b_0 "b"
                OpName %unused_entry_point "unused_entry_point"
-               OpMemberDecorate %a 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.spvasm
index 83ad806..b6c00d5 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.spvasm
@@ -26,9 +26,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.spvasm
index aaf4a6d..5958493 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.spvasm
@@ -29,9 +29,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.spvasm
index d4a23be..f14a839 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.spvasm
@@ -29,9 +29,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.spvasm
index 83c03cc..0ae2c72 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.spvasm
@@ -31,11 +31,6 @@
                OpDecorate %5 DescriptorSet 1
                OpDecorate %5 Binding 4
                OpDecorate %5 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %S1 0 Offset 0
-               OpDecorate %_arr_S1_uint_8 ArrayStride 32
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
 %_ptr_Private_uint = OpTypePointer Private %uint
           %4 = OpConstantNull %uint
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.spvasm
index 32c0489..586425f 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.spvasm
@@ -25,9 +25,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.spvasm
index f1e1e53..faa3169 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.spvasm
@@ -27,10 +27,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpDecorate %_arr__arr_InnerS_uint_8_uint_8 ArrayStride 32
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.spvasm
index 82a0772..71acf3b 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.spvasm
@@ -27,10 +27,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpMemberDecorate %S1 0 Offset 0
-               OpDecorate %_arr_S1_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.spvasm
index f1d0b41..97829ac 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.spvasm
@@ -29,11 +29,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %S1 0 Offset 0
-               OpDecorate %_arr_S1_uint_8 ArrayStride 32
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.spvasm
index c6eedee..18f706e 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.spvasm
@@ -22,9 +22,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %OuterS 0 Offset 0
-               OpMemberDecorate %OuterS 0 ColMajor
-               OpMemberDecorate %OuterS 0 MatrixStride 16
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.spvasm
index a57a1c1..62501e75 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.spvasm
@@ -26,10 +26,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
-               OpMemberDecorate %OuterS 1 Offset 32
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.spvasm
index ddcced3..9c6adba 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.spvasm
@@ -27,10 +27,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %S1 0 Offset 0
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.spvasm
index ea871d9..a939265 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.spvasm
@@ -22,7 +22,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.spvasm
index 678b22f..e87bc73 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.spvasm
@@ -25,8 +25,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpDecorate %_arr_uint_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.spvasm
index 8a4a477..7047bda 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.spvasm
@@ -26,9 +26,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.spvasm b/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.spvasm
index a1b2091..4c3953f 100644
--- a/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.spvasm
+++ b/test/tint/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.spvasm
@@ -27,9 +27,6 @@
                OpDecorate %1 DescriptorSet 1
                OpDecorate %1 Binding 4
                OpDecorate %1 NonWritable
-               OpMemberDecorate %InnerS 0 Offset 0
-               OpDecorate %_arr_InnerS_uint_8 ArrayStride 4
-               OpMemberDecorate %OuterS 0 Offset 0
        %uint = OpTypeInt 32 0
    %Uniforms = OpTypeStruct %uint
 %uniforms_block = OpTypeStruct %Uniforms
diff --git a/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.spvasm b/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.spvasm
index 9de8a97..aaf23a2 100644
--- a/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.spvasm
+++ b/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.spvasm
@@ -17,8 +17,6 @@
                OpName %x "x"
                OpName %x "p"
                OpName %unused_entry_point "unused_entry_point"
-               OpDecorate %_arr_v4int_uint_4 ArrayStride 16
-               OpMemberDecorate %S 0 Offset 0
         %int = OpTypeInt 32 1
 %_ptr_Private_int = OpTypePointer Private %int
           %4 = OpConstantNull %int
diff --git a/test/tint/statements/compound_assign/for_loop.wgsl.expected.spvasm b/test/tint/statements/compound_assign/for_loop.wgsl.expected.spvasm
index 925529d..c8f2b8c 100644
--- a/test/tint/statements/compound_assign/for_loop.wgsl.expected.spvasm
+++ b/test/tint/statements/compound_assign/for_loop.wgsl.expected.spvasm
@@ -34,7 +34,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/statements/discard/atomic_cmpxchg.wgsl.expected.spvasm b/test/tint/statements/discard/atomic_cmpxchg.wgsl.expected.spvasm
index e98d965..1f22672 100644
--- a/test/tint/statements/discard/atomic_cmpxchg.wgsl.expected.spvasm
+++ b/test/tint/statements/discard/atomic_cmpxchg.wgsl.expected.spvasm
@@ -24,8 +24,6 @@
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
                OpDecorate %foo_loc0_Output Location 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 0 Offset 0
-               OpMemberDecorate %__atomic_compare_exchange_result_i32 1 Offset 4
         %int = OpTypeInt 32 1
     %a_block = OpTypeStruct %int
 %_ptr_StorageBuffer_a_block = OpTypePointer StorageBuffer %a_block
diff --git a/test/tint/struct/type_initializer.wgsl.expected.spvasm b/test/tint/struct/type_initializer.wgsl.expected.spvasm
index 43fa416..885f128 100644
--- a/test/tint/struct/type_initializer.wgsl.expected.spvasm
+++ b/test/tint/struct/type_initializer.wgsl.expected.spvasm
@@ -38,18 +38,6 @@
                OpName %aosoa_empty "aosoa_empty"
                OpName %aosoa_nonempty "aosoa_nonempty"
                OpName %aosoa_nonempty_with_expr "aosoa_nonempty_with_expr"
-               OpMemberDecorate %S1 0 Offset 0
-               OpMemberDecorate %S1 1 Offset 4
-               OpMemberDecorate %S1 2 Offset 8
-               OpMemberDecorate %S1 3 Offset 12
-               OpMemberDecorate %S3 0 Offset 0
-               OpMemberDecorate %S3 1 Offset 4
-               OpMemberDecorate %S2 0 Offset 0
-               OpMemberDecorate %S2 1 Offset 4
-               OpMemberDecorate %S3 2 Offset 20
-               OpDecorate %_arr_int_uint_2 ArrayStride 4
-               OpMemberDecorate %T 0 Offset 0
-               OpDecorate %_arr_T_uint_2 ArrayStride 8
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/types/function_scope_declarations.wgsl.expected.spvasm b/test/tint/types/function_scope_declarations.wgsl.expected.spvasm
index 3dc788f..84af644 100644
--- a/test/tint/types/function_scope_declarations.wgsl.expected.spvasm
+++ b/test/tint/types/function_scope_declarations.wgsl.expected.spvasm
@@ -33,8 +33,6 @@
                OpName %f32_var "ptr_f32"
                OpName %v4f32_var "ptr_vec"
                OpName %arr_var "ptr_arr"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/types/functions/parameters.wgsl.expected.spvasm b/test/tint/types/functions/parameters.wgsl.expected.spvasm
index f57677c..4845cfa 100644
--- a/test/tint/types/functions/parameters.wgsl.expected.spvasm
+++ b/test/tint/types/functions/parameters.wgsl.expected.spvasm
@@ -28,8 +28,6 @@
                OpName %b "b"
                OpName %c "c"
                OpName %d "d"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %void = OpTypeVoid
        %bool = OpTypeBool
         %int = OpTypeInt 32 1
diff --git a/test/tint/types/functions/return_types.wgsl.expected.spvasm b/test/tint/types/functions/return_types.wgsl.expected.spvasm
index 4814a6a..ee62a54 100644
--- a/test/tint/types/functions/return_types.wgsl.expected.spvasm
+++ b/test/tint/types/functions/return_types.wgsl.expected.spvasm
@@ -30,8 +30,6 @@
                OpName %h "h"
                OpName %i "i"
                OpName %j "j"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %bool = OpTypeBool
           %3 = OpTypeFunction %bool
       %false = OpConstantFalse %bool
diff --git a/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.spvasm
index 8d01739..7e6817a 100644
--- a/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.spvasm
@@ -27,11 +27,6 @@
                OpDecorate %main_global_invocation_id_Input BuiltIn GlobalInvocationId
                OpDecorate %main_workgroup_id_Input BuiltIn WorkgroupId
                OpDecorate %main_num_workgroups_Input BuiltIn NumWorkgroups
-               OpMemberDecorate %ComputeInputs 0 Offset 0
-               OpMemberDecorate %ComputeInputs 1 Offset 12
-               OpMemberDecorate %ComputeInputs 2 Offset 16
-               OpMemberDecorate %ComputeInputs 3 Offset 32
-               OpMemberDecorate %ComputeInputs 4 Offset 48
        %uint = OpTypeInt 32 0
      %v3uint = OpTypeVector %uint 3
 %_ptr_Input_v3uint = OpTypePointer Input %v3uint
diff --git a/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.spvasm
index 0cff565..3a6637a 100644
--- a/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.spvasm
@@ -26,8 +26,6 @@
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
                OpDecorate %main_global_invocation_id_Input BuiltIn GlobalInvocationId
                OpDecorate %main_workgroup_id_Input BuiltIn WorkgroupId
-               OpMemberDecorate %ComputeInputs0 0 Offset 0
-               OpMemberDecorate %ComputeInputs1 0 Offset 0
        %uint = OpTypeInt 32 0
      %v3uint = OpTypeVector %uint 3
 %_ptr_Input_v3uint = OpTypePointer Input %v3uint
diff --git a/test/tint/types/functions/shader_io/compute_subgroup_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/compute_subgroup_builtins_struct.wgsl.expected.spvasm
index d7ccfbd..d51fc1e 100644
--- a/test/tint/types/functions/shader_io/compute_subgroup_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/compute_subgroup_builtins_struct.wgsl.expected.spvasm
@@ -27,8 +27,6 @@
                OpDecorate %1 Coherent
                OpDecorate %main_subgroup_invocation_id_Input BuiltIn SubgroupLocalInvocationId
                OpDecorate %main_subgroup_size_Input BuiltIn SubgroupSize
-               OpMemberDecorate %ComputeInputs 0 Offset 0
-               OpMemberDecorate %ComputeInputs 1 Offset 4
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
 %output_block = OpTypeStruct %_runtimearr_uint
diff --git a/test/tint/types/functions/shader_io/fragment_f16_io_polyfill.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_f16_io_polyfill.wgsl.expected.spvasm
index d944c92..a8e6193 100644
--- a/test/tint/types/functions/shader_io/fragment_f16_io_polyfill.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_f16_io_polyfill.wgsl.expected.spvasm
@@ -25,8 +25,6 @@
                OpDecorate %frag_main_loc2_Input Location 2
                OpDecorate %frag_main_loc1_Output Location 1
                OpDecorate %frag_main_loc2_Output Location 2
-               OpMemberDecorate %Outputs 0 Offset 0
-               OpMemberDecorate %Outputs 1 Offset 8
       %float = OpTypeFloat 32
 %_ptr_Input_float = OpTypePointer Input %float
 %frag_main_loc1_Input = OpVariable %_ptr_Input_float Input
diff --git a/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.spvasm
index 9bf677e..4010755 100644
--- a/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.spvasm
@@ -24,7 +24,6 @@
                OpDecorate %main_front_facing_Input BuiltIn FrontFacing
                OpDecorate %main_sample_index_Input Flat
                OpDecorate %main_sample_index_Input BuiltIn SampleId
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Input BuiltIn SampleMask
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
diff --git a/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.spvasm
index 5936b0f..5104fa2 100644
--- a/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.spvasm
@@ -26,12 +26,7 @@
                OpDecorate %main_front_facing_Input BuiltIn FrontFacing
                OpDecorate %main_sample_index_Input Flat
                OpDecorate %main_sample_index_Input BuiltIn SampleId
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Input BuiltIn SampleMask
-               OpMemberDecorate %FragmentInputs 0 Offset 0
-               OpMemberDecorate %FragmentInputs 1 Offset 16
-               OpMemberDecorate %FragmentInputs 2 Offset 20
-               OpMemberDecorate %FragmentInputs 3 Offset 24
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Input_v4float = OpTypePointer Input %v4float
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.spvasm
index 3501682..4fd0db0 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.spvasm
@@ -29,10 +29,6 @@
                OpDecorate %main_loc1_Input Flat
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc3_Input Location 3
-               OpMemberDecorate %FragmentInputs 0 Offset 0
-               OpMemberDecorate %FragmentInputs 1 Offset 4
-               OpMemberDecorate %FragmentInputs 2 Offset 8
-               OpMemberDecorate %FragmentInputs 3 Offset 16
         %int = OpTypeInt 32 1
 %_ptr_Input_int = OpTypePointer Input %int
 %main_loc0_Input = OpVariable %_ptr_Input_int Input
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.spvasm
index 8247555..8e02380 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.spvasm
@@ -41,12 +41,6 @@
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_loc4_Input Location 4
                OpDecorate %main_loc5_Input Location 5
-               OpMemberDecorate %FragmentInputs 0 Offset 0
-               OpMemberDecorate %FragmentInputs 1 Offset 4
-               OpMemberDecorate %FragmentInputs 2 Offset 8
-               OpMemberDecorate %FragmentInputs 3 Offset 16
-               OpMemberDecorate %FragmentInputs 4 Offset 32
-               OpMemberDecorate %FragmentInputs 5 Offset 40
         %int = OpTypeInt 32 1
 %_ptr_Input_int = OpTypePointer Input %int
 %main_loc0_Input = OpVariable %_ptr_Input_int Input
diff --git a/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.spvasm
index bc951f0..b7d51d1 100644
--- a/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.spvasm
@@ -45,13 +45,8 @@
                OpDecorate %main_sample_index_Input Flat
                OpDecorate %main_sample_index_Input BuiltIn SampleId
                OpDecorate %main_loc3_Input Location 3
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Input BuiltIn SampleMask
                OpDecorate %main_loc2_Input Location 2
-               OpMemberDecorate %FragmentInputs0 0 Offset 0
-               OpMemberDecorate %FragmentInputs0 1 Offset 16
-               OpMemberDecorate %FragmentInputs1 0 Offset 0
-               OpMemberDecorate %FragmentInputs1 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Input_v4float = OpTypePointer Input %v4float
diff --git a/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.spvasm
index d611924..da1b0c5 100644
--- a/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.spvasm
@@ -56,15 +56,9 @@
                OpDecorate %main_sample_index_Input BuiltIn SampleId
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_loc5_Input Location 5
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Input BuiltIn SampleMask
                OpDecorate %main_loc2_Input Location 2
                OpDecorate %main_loc4_Input Location 4
-               OpMemberDecorate %FragmentInputs0 0 Offset 0
-               OpMemberDecorate %FragmentInputs0 1 Offset 16
-               OpMemberDecorate %FragmentInputs1 0 Offset 0
-               OpMemberDecorate %FragmentInputs1 1 Offset 16
-               OpMemberDecorate %FragmentInputs1 2 Offset 24
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Input_v4float = OpTypePointer Input %v4float
diff --git a/test/tint/types/functions/shader_io/fragment_output_builtins.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_builtins.wgsl.expected.spvasm
index 0601e90..6b88b7b 100644
--- a/test/tint/types/functions/shader_io/fragment_output_builtins.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_builtins.wgsl.expected.spvasm
@@ -67,7 +67,6 @@
                OpName %main2_sample_mask_Output "main2_sample_mask_Output"
                OpName %main2_inner "main2_inner"
                OpName %main2 "main2"
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main2_sample_mask_Output BuiltIn SampleMask
        %uint = OpTypeInt 32 0
      %uint_1 = OpConstant %uint 1
diff --git a/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.spvasm
index c8a45a0..1a0d0ee 100644
--- a/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.spvasm
@@ -24,10 +24,7 @@
                OpMemberDecorate %tint_push_constant_struct 1 Offset 4
                OpDecorate %tint_push_constant_struct Block
                OpDecorate %main_frag_depth_Output BuiltIn FragDepth
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Output BuiltIn SampleMask
-               OpMemberDecorate %FragmentOutputs 0 Offset 0
-               OpMemberDecorate %FragmentOutputs 1 Offset 4
       %float = OpTypeFloat 32
 %tint_push_constant_struct = OpTypeStruct %float %float
 %_ptr_PushConstant_tint_push_constant_struct = OpTypePointer PushConstant %tint_push_constant_struct
diff --git a/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.spvasm
index 1714219..62bcfda 100644
--- a/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.spvasm
@@ -22,10 +22,6 @@
                OpDecorate %main_loc1_Output Location 1
                OpDecorate %main_loc2_Output Location 2
                OpDecorate %main_loc3_Output Location 3
-               OpMemberDecorate %FragmentOutputs 0 Offset 0
-               OpMemberDecorate %FragmentOutputs 1 Offset 4
-               OpMemberDecorate %FragmentOutputs 2 Offset 8
-               OpMemberDecorate %FragmentOutputs 3 Offset 16
         %int = OpTypeInt 32 1
 %_ptr_Output_int = OpTypePointer Output %int
 %main_loc0_Output = OpVariable %_ptr_Output_int Output
diff --git a/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.spvasm
index 3e1d57a..771b601 100644
--- a/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.spvasm
@@ -32,12 +32,6 @@
                OpDecorate %main_loc3_Output Location 3
                OpDecorate %main_loc4_Output Location 4
                OpDecorate %main_loc5_Output Location 5
-               OpMemberDecorate %FragmentOutputs 0 Offset 0
-               OpMemberDecorate %FragmentOutputs 1 Offset 4
-               OpMemberDecorate %FragmentOutputs 2 Offset 8
-               OpMemberDecorate %FragmentOutputs 3 Offset 16
-               OpMemberDecorate %FragmentOutputs 4 Offset 32
-               OpMemberDecorate %FragmentOutputs 5 Offset 40
         %int = OpTypeInt 32 1
 %_ptr_Output_int = OpTypePointer Output %int
 %main_loc0_Output = OpVariable %_ptr_Output_int Output
diff --git a/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.spvasm
index 65f1ac6..8609055 100644
--- a/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.spvasm
@@ -35,15 +35,8 @@
                OpDecorate %main_frag_depth_Output BuiltIn FragDepth
                OpDecorate %main_loc1_Output Location 1
                OpDecorate %main_loc2_Output Location 2
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Output BuiltIn SampleMask
                OpDecorate %main_loc3_Output Location 3
-               OpMemberDecorate %FragmentOutputs 0 Offset 0
-               OpMemberDecorate %FragmentOutputs 1 Offset 4
-               OpMemberDecorate %FragmentOutputs 2 Offset 8
-               OpMemberDecorate %FragmentOutputs 3 Offset 12
-               OpMemberDecorate %FragmentOutputs 4 Offset 16
-               OpMemberDecorate %FragmentOutputs 5 Offset 32
       %float = OpTypeFloat 32
 %tint_push_constant_struct = OpTypeStruct %float %float
 %_ptr_PushConstant_tint_push_constant_struct = OpTypePointer PushConstant %tint_push_constant_struct
diff --git a/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.spvasm
index ee4eabb..1a0bc2b 100644
--- a/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.spvasm
@@ -43,19 +43,10 @@
                OpDecorate %main_frag_depth_Output BuiltIn FragDepth
                OpDecorate %main_loc1_Output Location 1
                OpDecorate %main_loc2_Output Location 2
-               OpDecorate %_arr_uint_uint_1 ArrayStride 4
                OpDecorate %main_sample_mask_Output BuiltIn SampleMask
                OpDecorate %main_loc3_Output Location 3
                OpDecorate %main_loc4_Output Location 4
                OpDecorate %main_loc5_Output Location 5
-               OpMemberDecorate %FragmentOutputs 0 Offset 0
-               OpMemberDecorate %FragmentOutputs 1 Offset 4
-               OpMemberDecorate %FragmentOutputs 2 Offset 8
-               OpMemberDecorate %FragmentOutputs 3 Offset 12
-               OpMemberDecorate %FragmentOutputs 4 Offset 16
-               OpMemberDecorate %FragmentOutputs 5 Offset 32
-               OpMemberDecorate %FragmentOutputs 6 Offset 48
-               OpMemberDecorate %FragmentOutputs 7 Offset 56
       %float = OpTypeFloat 32
 %tint_push_constant_struct = OpTypeStruct %float %float
 %_ptr_PushConstant_tint_push_constant_struct = OpTypePointer PushConstant %tint_push_constant_struct
diff --git a/test/tint/types/functions/shader_io/fragment_subgroup_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/fragment_subgroup_builtins_struct.wgsl.expected.spvasm
index 1c9449e..bf96238 100644
--- a/test/tint/types/functions/shader_io/fragment_subgroup_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/fragment_subgroup_builtins_struct.wgsl.expected.spvasm
@@ -29,8 +29,6 @@
                OpDecorate %main_subgroup_invocation_id_Input BuiltIn SubgroupLocalInvocationId
                OpDecorate %main_subgroup_size_Input Flat
                OpDecorate %main_subgroup_size_Input BuiltIn SubgroupSize
-               OpMemberDecorate %FragmentInputs 0 Offset 0
-               OpMemberDecorate %FragmentInputs 1 Offset 4
        %uint = OpTypeInt 32 0
 %_runtimearr_uint = OpTypeRuntimeArray %uint
 %output_block = OpTypeStruct %_runtimearr_uint
diff --git a/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.spvasm
index 87ee4f9..f94e73e 100644
--- a/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.spvasm
@@ -51,16 +51,6 @@
                OpDecorate %main_loc8_Input Location 8
                OpDecorate %main_loc9_Input Location 9
                OpDecorate %main_loc9_Input NoPerspective
-               OpMemberDecorate %In 0 Offset 0
-               OpMemberDecorate %In 1 Offset 4
-               OpMemberDecorate %In 2 Offset 8
-               OpMemberDecorate %In 3 Offset 12
-               OpMemberDecorate %In 4 Offset 16
-               OpMemberDecorate %In 5 Offset 20
-               OpMemberDecorate %In 6 Offset 24
-               OpMemberDecorate %In 7 Offset 28
-               OpMemberDecorate %In 8 Offset 32
-               OpMemberDecorate %In 9 Offset 36
       %float = OpTypeFloat 32
 %_ptr_Input_float = OpTypePointer Input %float
 %main_loc0_Input = OpVariable %_ptr_Input_float Input
diff --git a/test/tint/types/functions/shader_io/interpolate_integers.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/interpolate_integers.wgsl.expected.spvasm
index 3ea39cd..e621158 100644
--- a/test/tint/types/functions/shader_io/interpolate_integers.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/interpolate_integers.wgsl.expected.spvasm
@@ -33,11 +33,6 @@
                OpDecorate %vert_main_loc3_Output Flat
                OpDecorate %vert_main_position_Output BuiltIn Position
                OpDecorate %vert_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
-               OpMemberDecorate %Interface 3 Offset 32
-               OpMemberDecorate %Interface 4 Offset 48
         %int = OpTypeInt 32 1
 %_ptr_Output_int = OpTypePointer Output %int
 %vert_main_loc0_Output = OpVariable %_ptr_Output_int Output
@@ -119,11 +114,6 @@
                OpDecorate %frag_main_loc3_Input Flat
                OpDecorate %frag_main_position_Input BuiltIn FragCoord
                OpDecorate %frag_main_loc0_Output Location 0
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
-               OpMemberDecorate %Interface 3 Offset 32
-               OpMemberDecorate %Interface 4 Offset 48
         %int = OpTypeInt 32 1
 %_ptr_Input_int = OpTypePointer Input %int
 %frag_main_loc0_Input = OpVariable %_ptr_Input_int Input
diff --git a/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.spvasm
index ce31ad3..3a84737 100644
--- a/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.spvasm
@@ -47,15 +47,6 @@
                OpDecorate %main_loc7_Output NoPerspective
                OpDecorate %main_loc7_Output Sample
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Out 0 Offset 0
-               OpMemberDecorate %Out 1 Offset 16
-               OpMemberDecorate %Out 2 Offset 20
-               OpMemberDecorate %Out 3 Offset 24
-               OpMemberDecorate %Out 4 Offset 28
-               OpMemberDecorate %Out 5 Offset 32
-               OpMemberDecorate %Out 6 Offset 36
-               OpMemberDecorate %Out 7 Offset 40
-               OpMemberDecorate %Out 8 Offset 44
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.spvasm
index 6d0f910..4bb9a84 100644
--- a/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.spvasm
@@ -15,7 +15,6 @@
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main_position_Output Invariant
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Out 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/types/functions/shader_io/shared_struct_different_stages.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/shared_struct_different_stages.wgsl.expected.spvasm
index af4d894..88f3d8e 100644
--- a/test/tint/types/functions/shader_io/shared_struct_different_stages.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/shared_struct_different_stages.wgsl.expected.spvasm
@@ -23,9 +23,6 @@
                OpDecorate %vert_main_loc2_Output Location 2
                OpDecorate %vert_main_position_Output BuiltIn Position
                OpDecorate %vert_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
       %float = OpTypeFloat 32
 %_ptr_Output_float = OpTypePointer Output %float
 %vert_main_loc1_Output = OpVariable %_ptr_Output_float Output
@@ -86,9 +83,6 @@
                OpDecorate %frag_main_loc1_Input Location 1
                OpDecorate %frag_main_loc2_Input Location 2
                OpDecorate %frag_main_position_Input BuiltIn FragCoord
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
       %float = OpTypeFloat 32
 %_ptr_Input_float = OpTypePointer Input %float
 %frag_main_loc1_Input = OpVariable %_ptr_Input_float Input
diff --git a/test/tint/types/functions/shader_io/shared_struct_different_stages_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/shared_struct_different_stages_f16.wgsl.expected.spvasm
index 2a4d270..a21692c 100644
--- a/test/tint/types/functions/shader_io/shared_struct_different_stages_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/shared_struct_different_stages_f16.wgsl.expected.spvasm
@@ -27,9 +27,6 @@
                OpDecorate %vert_main_loc2_Output Location 2
                OpDecorate %vert_main_position_Output BuiltIn Position
                OpDecorate %vert_main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
       %float = OpTypeFloat 32
 %_ptr_Output_float = OpTypePointer Output %float
 %vert_main_loc1_Output = OpVariable %_ptr_Output_float Output
@@ -96,9 +93,6 @@
                OpDecorate %frag_main_loc1_Input Location 1
                OpDecorate %frag_main_loc2_Input Location 2
                OpDecorate %frag_main_position_Input BuiltIn FragCoord
-               OpMemberDecorate %Interface 0 Offset 0
-               OpMemberDecorate %Interface 1 Offset 4
-               OpMemberDecorate %Interface 2 Offset 16
       %float = OpTypeFloat 32
 %_ptr_Input_float = OpTypePointer Input %float
 %frag_main_loc1_Input = OpVariable %_ptr_Input_float Input
diff --git a/test/tint/types/functions/shader_io/shared_struct_helper_function.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/shared_struct_helper_function.wgsl.expected.spvasm
index 3f3cf3f..ece2182 100644
--- a/test/tint/types/functions/shader_io/shared_struct_helper_function.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/shared_struct_helper_function.wgsl.expected.spvasm
@@ -23,8 +23,6 @@
                OpDecorate %vert_main1_loc0_Output Location 0
                OpDecorate %vert_main1_loc0_Output Flat
                OpDecorate %vert_main1___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -89,8 +87,6 @@
                OpDecorate %vert_main2_loc0_Output Location 0
                OpDecorate %vert_main2_loc0_Output Flat
                OpDecorate %vert_main2___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutput 0 Offset 0
-               OpMemberDecorate %VertexOutput 1 Offset 16
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.spvasm
index abccbc2..1f926e1 100644
--- a/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.spvasm
@@ -21,8 +21,6 @@
                OpDecorate %main_instance_index_Input BuiltIn InstanceIndex
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs 0 Offset 0
-               OpMemberDecorate %VertexInputs 1 Offset 4
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.spvasm
index d22620a..f32b01c 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.spvasm
@@ -30,10 +30,6 @@
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs 0 Offset 0
-               OpMemberDecorate %VertexInputs 1 Offset 4
-               OpMemberDecorate %VertexInputs 2 Offset 8
-               OpMemberDecorate %VertexInputs 3 Offset 16
         %int = OpTypeInt 32 1
 %_ptr_Input_int = OpTypePointer Input %int
 %main_loc0_Input = OpVariable %_ptr_Input_int Input
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.spvasm
index b5f12c6..c36ad92 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.spvasm
@@ -42,12 +42,6 @@
                OpDecorate %main_loc5_Input Location 5
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs 0 Offset 0
-               OpMemberDecorate %VertexInputs 1 Offset 4
-               OpMemberDecorate %VertexInputs 2 Offset 8
-               OpMemberDecorate %VertexInputs 3 Offset 16
-               OpMemberDecorate %VertexInputs 4 Offset 32
-               OpMemberDecorate %VertexInputs 5 Offset 40
         %int = OpTypeInt 32 1
 %_ptr_Input_int = OpTypePointer Input %int
 %main_loc0_Input = OpVariable %_ptr_Input_int Input
diff --git a/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.spvasm
index 63dfd94..c79c2ef 100644
--- a/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.spvasm
@@ -39,10 +39,6 @@
                OpDecorate %main_loc3_Input Location 3
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs0 0 Offset 0
-               OpMemberDecorate %VertexInputs0 1 Offset 4
-               OpMemberDecorate %VertexInputs1 0 Offset 0
-               OpMemberDecorate %VertexInputs1 1 Offset 16
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.spvasm
index c490b9f..c71adbb 100644
--- a/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.spvasm
@@ -51,11 +51,6 @@
                OpDecorate %main_loc4_Input Location 4
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexInputs0 0 Offset 0
-               OpMemberDecorate %VertexInputs0 1 Offset 4
-               OpMemberDecorate %VertexInputs1 0 Offset 0
-               OpMemberDecorate %VertexInputs1 1 Offset 16
-               OpMemberDecorate %VertexInputs1 2 Offset 32
        %uint = OpTypeInt 32 0
 %_ptr_Input_uint = OpTypePointer Input %uint
 %main_vertex_index_Input = OpVariable %_ptr_Input_uint Input
diff --git a/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.spvasm
index 31f22c4..4c56164 100644
--- a/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.spvasm
@@ -14,7 +14,6 @@
                OpName %main "main"
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
diff --git a/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.spvasm
index 836a1d2..d59913d 100644
--- a/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.spvasm
@@ -28,11 +28,6 @@
                OpDecorate %main_loc3_Output Location 3
                OpDecorate %main_position_Output BuiltIn Position
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 4
-               OpMemberDecorate %VertexOutputs 2 Offset 8
-               OpMemberDecorate %VertexOutputs 3 Offset 16
-               OpMemberDecorate %VertexOutputs 4 Offset 32
         %int = OpTypeInt 32 1
 %_ptr_Output_int = OpTypePointer Output %int
 %main_loc0_Output = OpVariable %_ptr_Output_int Output
diff --git a/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.spvasm b/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.spvasm
index 1f0fb30..a1328f6 100644
--- a/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.spvasm
+++ b/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.spvasm
@@ -38,13 +38,6 @@
                OpDecorate %main_loc4_Output Location 4
                OpDecorate %main_loc5_Output Location 5
                OpDecorate %main___point_size_Output BuiltIn PointSize
-               OpMemberDecorate %VertexOutputs 0 Offset 0
-               OpMemberDecorate %VertexOutputs 1 Offset 4
-               OpMemberDecorate %VertexOutputs 2 Offset 8
-               OpMemberDecorate %VertexOutputs 3 Offset 16
-               OpMemberDecorate %VertexOutputs 4 Offset 32
-               OpMemberDecorate %VertexOutputs 5 Offset 48
-               OpMemberDecorate %VertexOutputs 6 Offset 56
         %int = OpTypeInt 32 1
 %_ptr_Output_int = OpTypePointer Output %int
 %main_loc0_Output = OpVariable %_ptr_Output_int Output
diff --git a/test/tint/types/module_scope_var.wgsl.expected.spvasm b/test/tint/types/module_scope_var.wgsl.expected.spvasm
index a47f86a..9e0d0f6 100644
--- a/test/tint/types/module_scope_var.wgsl.expected.spvasm
+++ b/test/tint/types/module_scope_var.wgsl.expected.spvasm
@@ -24,8 +24,6 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
        %bool = OpTypeBool
 %_ptr_Private_bool = OpTypePointer Private %bool
diff --git a/test/tint/types/module_scope_var_initializers.wgsl.expected.spvasm b/test/tint/types/module_scope_var_initializers.wgsl.expected.spvasm
index 687da32..1aa08e3 100644
--- a/test/tint/types/module_scope_var_initializers.wgsl.expected.spvasm
+++ b/test/tint/types/module_scope_var_initializers.wgsl.expected.spvasm
@@ -20,8 +20,6 @@
                OpName %S "S"
                OpName %struct_var "struct_var"
                OpName %main "main"
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 0 Offset 0
        %bool = OpTypeBool
 %_ptr_Private_bool = OpTypePointer Private %bool
       %false = OpConstantFalse %bool
diff --git a/test/tint/types/struct_members.wgsl.expected.spvasm b/test/tint/types/struct_members.wgsl.expected.spvasm
index dabad67..3198e55 100644
--- a/test/tint/types/struct_members.wgsl.expected.spvasm
+++ b/test/tint/types/struct_members.wgsl.expected.spvasm
@@ -22,20 +22,6 @@
                OpMemberName %S 9 "member_struct"
                OpName %S "S"
                OpName %s "s"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
-               OpMemberDecorate %S 2 Offset 8
-               OpMemberDecorate %S 3 Offset 12
-               OpMemberDecorate %S 4 Offset 16
-               OpMemberDecorate %S 5 Offset 32
-               OpMemberDecorate %S 6 Offset 48
-               OpMemberDecorate %S 7 Offset 64
-               OpMemberDecorate %S 7 ColMajor
-               OpMemberDecorate %S 7 MatrixStride 16
-               OpDecorate %_arr_float_uint_4 ArrayStride 4
-               OpMemberDecorate %S 8 Offset 96
-               OpMemberDecorate %S_inner 0 Offset 0
-               OpMemberDecorate %S 9 Offset 112
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
        %bool = OpTypeBool
diff --git a/test/tint/var/inferred/global.wgsl.expected.spvasm b/test/tint/var/inferred/global.wgsl.expected.spvasm
index 9132a17..51471d4 100644
--- a/test/tint/var/inferred/global.wgsl.expected.spvasm
+++ b/test/tint/var/inferred/global.wgsl.expected.spvasm
@@ -42,8 +42,6 @@
                OpName %l14 "l14"
                OpName %l15 "l15"
                OpName %l16 "l16"
-               OpMemberDecorate %MyStruct 0 Offset 0
-               OpDecorate %_arr_float_uint_10 ArrayStride 4
         %int = OpTypeInt 32 1
 %_ptr_Private_int = OpTypePointer Private %int
       %int_1 = OpConstant %int 1
diff --git a/test/tint/var/initialization/function/array/array_i32.wgsl.expected.spvasm b/test/tint/var/initialization/function/array/array_i32.wgsl.expected.spvasm
index ec5b82a..c34116d 100644
--- a/test/tint/var/initialization/function/array/array_i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/function/array/array_i32.wgsl.expected.spvasm
@@ -10,8 +10,6 @@
                OpName %main "main"
                OpName %zero "zero"
                OpName %init "init"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_3_uint_2 ArrayStride 12
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/var/initialization/function/array/i32.wgsl.expected.spvasm b/test/tint/var/initialization/function/array/i32.wgsl.expected.spvasm
index cbd366c..ea37dc2 100644
--- a/test/tint/var/initialization/function/array/i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/function/array/i32.wgsl.expected.spvasm
@@ -10,7 +10,6 @@
                OpName %main "main"
                OpName %zero "zero"
                OpName %init "init"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/var/initialization/function/nested_structs.wgsl.expected.spvasm b/test/tint/var/initialization/function/nested_structs.wgsl.expected.spvasm
index df1375c..9532867 100644
--- a/test/tint/var/initialization/function/nested_structs.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/function/nested_structs.wgsl.expected.spvasm
@@ -23,9 +23,6 @@
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
-               OpMemberDecorate %S1 0 Offset 0
-               OpMemberDecorate %S2 0 Offset 0
-               OpMemberDecorate %S3 0 Offset 0
         %int = OpTypeInt 32 1
   %out_block = OpTypeStruct %int
 %_ptr_StorageBuffer_out_block = OpTypePointer StorageBuffer %out_block
diff --git a/test/tint/var/initialization/function/struct.wgsl.expected.spvasm b/test/tint/var/initialization/function/struct.wgsl.expected.spvasm
index f46dca0..3c13a93 100644
--- a/test/tint/var/initialization/function/struct.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/function/struct.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpMemberName %S 1 "b"
                OpName %S "S"
                OpName %v "v"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
        %void = OpTypeVoid
           %3 = OpTypeFunction %void
         %int = OpTypeInt 32 1
diff --git a/test/tint/var/initialization/private/array/array_i32.wgsl.expected.spvasm b/test/tint/var/initialization/private/array/array_i32.wgsl.expected.spvasm
index 624a9eb..0b3bbe1 100644
--- a/test/tint/var/initialization/private/array/array_i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/private/array/array_i32.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %main "main"
                OpName %v0 "v0"
                OpName %v1 "v1"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_3_uint_2 ArrayStride 12
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_3 = OpConstant %uint 3
diff --git a/test/tint/var/initialization/private/array/i32.wgsl.expected.spvasm b/test/tint/var/initialization/private/array/i32.wgsl.expected.spvasm
index 376fd28..d77c950 100644
--- a/test/tint/var/initialization/private/array/i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/private/array/i32.wgsl.expected.spvasm
@@ -12,7 +12,6 @@
                OpName %main "main"
                OpName %v0 "v0"
                OpName %v1 "v1"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
      %uint_3 = OpConstant %uint 3
diff --git a/test/tint/var/initialization/private/nested_structs.wgsl.expected.spvasm b/test/tint/var/initialization/private/nested_structs.wgsl.expected.spvasm
index 9cec159..4436e37 100644
--- a/test/tint/var/initialization/private/nested_structs.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/private/nested_structs.wgsl.expected.spvasm
@@ -17,9 +17,6 @@
                OpMemberName %out_block 0 "inner"
                OpName %out_block "out_block"
                OpName %main "main"
-               OpMemberDecorate %S1 0 Offset 0
-               OpMemberDecorate %S2 0 Offset 0
-               OpMemberDecorate %S3 0 Offset 0
                OpMemberDecorate %out_block 0 Offset 0
                OpDecorate %out_block Block
                OpDecorate %11 DescriptorSet 0
diff --git a/test/tint/var/initialization/private/struct.wgsl.expected.spvasm b/test/tint/var/initialization/private/struct.wgsl.expected.spvasm
index f496fe4..715a111 100644
--- a/test/tint/var/initialization/private/struct.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/private/struct.wgsl.expected.spvasm
@@ -12,8 +12,6 @@
                OpName %S "S"
                OpName %v "v"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32
           %S = OpTypeStruct %int %float
diff --git a/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.spvasm b/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.spvasm
index 733eb26..7e8dc12 100644
--- a/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.spvasm
@@ -13,8 +13,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %v "v"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
-               OpDecorate %_arr__arr_int_uint_3_uint_2 ArrayStride 12
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.spvasm b/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.spvasm
index bbc7f78..b24c0fb 100644
--- a/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %v "v"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.spvasm b/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.spvasm
index 50ff376..16a4148 100644
--- a/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %v "v"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_23 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.spvasm b/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.spvasm
index 858b0a0..b225461 100644
--- a/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.spvasm
@@ -13,7 +13,6 @@
                OpName %tint_local_index "tint_local_index"
                OpName %v "v"
                OpName %main "main"
-               OpDecorate %_arr_int_uint_3 ArrayStride 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
diff --git a/test/tint/var/initialization/workgroup/struct.wgsl.expected.spvasm b/test/tint/var/initialization/workgroup/struct.wgsl.expected.spvasm
index 2f94027..c4a5c35 100644
--- a/test/tint/var/initialization/workgroup/struct.wgsl.expected.spvasm
+++ b/test/tint/var/initialization/workgroup/struct.wgsl.expected.spvasm
@@ -15,8 +15,6 @@
                OpName %main_inner "main_inner"
                OpName %tint_local_index "tint_local_index"
                OpName %main "main"
-               OpMemberDecorate %S 0 Offset 0
-               OpMemberDecorate %S 1 Offset 4
                OpDecorate %main_local_invocation_index_Input BuiltIn LocalInvocationIndex
         %int = OpTypeInt 32 1
       %float = OpTypeFloat 32