diff --git a/src/writer/glsl/generator_impl.cc b/src/writer/glsl/generator_impl.cc
index b1ab18b2cd..4ee27a3fd9 100644
--- a/src/writer/glsl/generator_impl.cc
+++ b/src/writer/glsl/generator_impl.cc
@@ -1877,6 +1877,25 @@ std::string GeneratorImpl::interpolation_to_modifiers(
   return modifiers;
 }
 
+bool GeneratorImpl::EmitDecorations(std::ostream& out,
+                                    const ast::DecorationList& decorations) {
+  if (decorations.empty()) {
+    return true;
+  }
+  bool first = true;
+  for (auto* deco : decorations) {
+    if (auto* location = deco->As<ast::LocationDecoration>()) {
+      out << (first ? "layout(" : ", ");
+      out << "location = " << std::to_string(location->value);
+      first = false;
+    }
+  }
+  if (!first) {
+    out << ") ";
+  }
+  return true;
+}
+
 bool GeneratorImpl::EmitEntryPointFunction(const ast::Function* func) {
   auto* func_sem = builder_.Sem().Get(func);
 
@@ -1962,10 +1981,13 @@ bool GeneratorImpl::EmitEntryPointFunction(const ast::Function* func) {
     auto* sem = builder_.Sem().Get(var);
     auto* str = sem->Type()->As<sem::Struct>();
     for (auto* member : str->Members()) {
-      if (ast::HasDecoration<ast::BuiltinDecoration>(
-              member->Declaration()->decorations)) {
+      auto decorations = member->Declaration()->decorations;
+      if (ast::HasDecoration<ast::BuiltinDecoration>(decorations)) {
         continue;
       }
+      if (!EmitDecorations(out, decorations)) {
+        return false;
+      }
       if (!EmitTypeAndName(
               out, member->Type(), ast::StorageClass::kInput,
               ast::Access::kReadWrite,
@@ -1980,10 +2002,13 @@ bool GeneratorImpl::EmitEntryPointFunction(const ast::Function* func) {
   auto* return_type = func_sem->ReturnType()->As<sem::Struct>();
   if (return_type) {
     for (auto* member : return_type->Members()) {
-      if (ast::HasDecoration<ast::BuiltinDecoration>(
-              member->Declaration()->decorations)) {
+      auto decorations = member->Declaration()->decorations;
+      if (ast::HasDecoration<ast::BuiltinDecoration>(decorations)) {
         continue;
       }
+      if (!EmitDecorations(out, decorations)) {
+        return false;
+      }
       if (!EmitTypeAndName(
               out, member->Type(), ast::StorageClass::kOutput,
               ast::Access::kReadWrite,
diff --git a/src/writer/glsl/generator_impl.h b/src/writer/glsl/generator_impl.h
index 03aa895f79..e53fd225cf 100644
--- a/src/writer/glsl/generator_impl.h
+++ b/src/writer/glsl/generator_impl.h
@@ -292,6 +292,11 @@ class GeneratorImpl : public TextGenerator {
   /// @returns true on success
   bool EmitWorkgroupVariable(const sem::Variable* var);
 
+  /// Handles emitting decorations
+  /// @param out the output of the expression stream
+  /// @param decos the decorations
+  /// @returns true if the decorations were emitted
+  bool EmitDecorations(std::ostream& out, const ast::DecorationList& decos);
   /// Handles emitting the entry point function
   /// @param func the entry point
   /// @returns true if the entry point function was emitted
@@ -316,7 +321,7 @@ class GeneratorImpl : public TextGenerator {
   /// Handles generating an identifier expression
   /// @param out the output of the expression stream
   /// @param expr the identifier expression
-  /// @returns true if the identifeir was emitted
+  /// @returns true if the identifier was emitted
   bool EmitIdentifier(std::ostream& out, const ast::IdentifierExpression* expr);
   /// Handles a member accessor expression
   /// @param out the output of the expression stream
diff --git a/src/writer/glsl/generator_impl_function_test.cc b/src/writer/glsl/generator_impl_function_test.cc
index 19aae8889f..7e19e4274a 100644
--- a/src/writer/glsl/generator_impl_function_test.cc
+++ b/src/writer/glsl/generator_impl_function_test.cc
@@ -157,8 +157,8 @@ tint_symbol_2 frag_main(tint_symbol_1 tint_symbol) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in float foo;
-out float value;
+layout(location = 0) in float foo;
+layout(location = 1) out float value;
 void main() {
   tint_symbol_1 inputs;
   inputs.foo = foo;
@@ -284,8 +284,8 @@ tint_symbol vert_main() {
   wrapper_result.col2 = inner_result.col2;
   return wrapper_result;
 }
-out float col1;
-out float col2;
+layout(location = 1) out float col1;
+layout(location = 2) out float col2;
 void main() {
   tint_symbol outputs;
   outputs = vert_main();
@@ -314,8 +314,8 @@ void frag_main(tint_symbol_2 tint_symbol_1) {
   frag_main_inner(tint_symbol_4);
   return;
 }
-in float col1;
-in float col2;
+layout(location = 1) in float col1;
+layout(location = 2) in float col2;
 void main() {
   tint_symbol_2 inputs;
   inputs.col1 = col1;
diff --git a/test/benchmark/animometer.wgsl.expected.glsl b/test/benchmark/animometer.wgsl.expected.glsl
index 533937f5cc..99ba629e76 100644
--- a/test/benchmark/animometer.wgsl.expected.glsl
+++ b/test/benchmark/animometer.wgsl.expected.glsl
@@ -72,9 +72,9 @@ tint_symbol_3 vert_main(tint_symbol_2 tint_symbol_1) {
   wrapper_result.v_color = inner_result.v_color;
   return wrapper_result;
 }
-in vec4 position;
-in vec4 color;
-out vec4 v_color;
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec4 color;
+layout(location = 0) out vec4 v_color;
 void main() {
   tint_symbol_2 inputs;
   inputs.position = position;
@@ -136,8 +136,8 @@ tint_symbol_6 frag_main(tint_symbol_5 tint_symbol_4) {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-in vec4 v_color;
-out vec4 value;
+layout(location = 0) in vec4 v_color;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_5 inputs;
   inputs.v_color = v_color;
diff --git a/test/benchmark/particles.wgsl.expected.glsl b/test/benchmark/particles.wgsl.expected.glsl
index 4edeac43cf..2e5f843528 100644
--- a/test/benchmark/particles.wgsl.expected.glsl
+++ b/test/benchmark/particles.wgsl.expected.glsl
@@ -86,11 +86,11 @@ tint_symbol_5 vs_main(tint_symbol_4 tint_symbol_3) {
   wrapper_result.quad_pos = inner_result.quad_pos;
   return wrapper_result;
 }
-in vec3 position;
-in vec4 color;
-in vec2 quad_pos;
-out vec4 color;
-out vec2 quad_pos;
+layout(location = 0) in vec3 position;
+layout(location = 1) in vec4 color;
+layout(location = 2) in vec2 quad_pos;
+layout(location = 0) out vec4 color;
+layout(location = 1) out vec2 quad_pos;
 void main() {
   tint_symbol_4 inputs;
   inputs.position = position;
@@ -184,9 +184,9 @@ tint_symbol_8 fs_main(tint_symbol_7 tint_symbol_6) {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-in vec4 color;
-in vec2 quad_pos;
-out vec4 value;
+layout(location = 0) in vec4 color;
+layout(location = 1) in vec2 quad_pos;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_7 inputs;
   inputs.color = color;
diff --git a/test/benchmark/shadow-fragment.wgsl.expected.glsl b/test/benchmark/shadow-fragment.wgsl.expected.glsl
index 8c70f2689b..fa5c1e2d66 100644
--- a/test/benchmark/shadow-fragment.wgsl.expected.glsl
+++ b/test/benchmark/shadow-fragment.wgsl.expected.glsl
@@ -64,10 +64,10 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in vec3 shadowPos;
-in vec3 fragPos;
-in vec3 fragNorm;
-out vec4 value;
+layout(location = 0) in vec3 shadowPos;
+layout(location = 1) in vec3 fragPos;
+layout(location = 2) in vec3 fragNorm;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_3 inputs;
   inputs.shadowPos = shadowPos;
diff --git a/test/benchmark/simple-fragment.wgsl.expected.glsl b/test/benchmark/simple-fragment.wgsl.expected.glsl
index af5753a03b..c168e70a20 100644
--- a/test/benchmark/simple-fragment.wgsl.expected.glsl
+++ b/test/benchmark/simple-fragment.wgsl.expected.glsl
@@ -28,8 +28,8 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.color = inner_result.color;
   return wrapper_result;
 }
-in vec4 color;
-out vec4 color;
+layout(location = 0) in vec4 color;
+layout(location = 0) out vec4 color;
 void main() {
   tint_symbol_3 inputs;
   inputs.color = color;
diff --git a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl
index d64d1d92bb..2128592ede 100644
--- a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl
+++ b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl
@@ -382,17 +382,17 @@ tint_symbol_5 fragmentMain(tint_symbol_4 tint_symbol_3) {
   wrapper_result.emissive = inner_result.emissive;
   return wrapper_result;
 }
-in vec3 worldPos;
-in vec3 view;
-in vec2 texcoord;
-in vec2 texcoord2;
-in vec4 color;
-in vec4 instanceColor;
-in vec3 normal;
-in vec3 tangent;
-in vec3 bitangent;
-out vec4 color;
-out vec4 emissive;
+layout(location = 0) in vec3 worldPos;
+layout(location = 1) in vec3 view;
+layout(location = 2) in vec2 texcoord;
+layout(location = 3) in vec2 texcoord2;
+layout(location = 4) in vec4 color;
+layout(location = 5) in vec4 instanceColor;
+layout(location = 6) in vec3 normal;
+layout(location = 7) in vec3 tangent;
+layout(location = 8) in vec3 bitangent;
+layout(location = 0) out vec4 color;
+layout(location = 1) out vec4 emissive;
 void main() {
   tint_symbol_4 inputs;
   inputs.worldPos = worldPos;
diff --git a/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl b/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl
index 7c0e6d7a63..97818d7eb5 100644
--- a/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl
+++ b/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl
@@ -124,26 +124,26 @@ tint_symbol_4 vertexMain(tint_symbol_3 tint_symbol_2) {
   wrapper_result.bitangent = inner_result.bitangent;
   return wrapper_result;
 }
-in vec4 position;
-in vec3 normal;
-in vec4 tangent;
-in vec2 texcoord;
-in uvec4 joints;
-in vec4 weights;
-in vec4 instance0;
-in vec4 instance1;
-in vec4 instance2;
-in vec4 instance3;
-in vec4 instanceColor;
-out vec3 worldPos;
-out vec3 view;
-out vec2 texcoord;
-out vec2 texcoord2;
-out vec4 color;
-out vec4 instanceColor;
-out vec3 normal;
-out vec3 tangent;
-out vec3 bitangent;
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec3 normal;
+layout(location = 2) in vec4 tangent;
+layout(location = 3) in vec2 texcoord;
+layout(location = 6) in uvec4 joints;
+layout(location = 7) in vec4 weights;
+layout(location = 8) in vec4 instance0;
+layout(location = 9) in vec4 instance1;
+layout(location = 10) in vec4 instance2;
+layout(location = 11) in vec4 instance3;
+layout(location = 12) in vec4 instanceColor;
+layout(location = 0) out vec3 worldPos;
+layout(location = 1) out vec3 view;
+layout(location = 2) out vec2 texcoord;
+layout(location = 3) out vec2 texcoord2;
+layout(location = 4) out vec4 color;
+layout(location = 5) out vec4 instanceColor;
+layout(location = 6) out vec3 normal;
+layout(location = 7) out vec3 tangent;
+layout(location = 8) out vec3 bitangent;
 void main() {
   tint_symbol_3 inputs;
   inputs.position = position;
diff --git a/test/bug/chromium/1251009.wgsl.expected.glsl b/test/bug/chromium/1251009.wgsl.expected.glsl
index eac1d6f7a9..77c6257434 100644
--- a/test/bug/chromium/1251009.wgsl.expected.glsl
+++ b/test/bug/chromium/1251009.wgsl.expected.glsl
@@ -34,10 +34,10 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in int loc0;
-in uint loc1;
-in uint loc1_1;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in uint loc1_1;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/bug/dawn/947.wgsl.expected.glsl b/test/bug/dawn/947.wgsl.expected.glsl
index 366a25df49..d932fbfe31 100644
--- a/test/bug/dawn/947.wgsl.expected.glsl
+++ b/test/bug/dawn/947.wgsl.expected.glsl
@@ -50,7 +50,7 @@ tint_symbol_3 vs_main(tint_symbol_2 tint_symbol_1) {
   wrapper_result.position = inner_result.position;
   return wrapper_result;
 }
-out vec2 texcoords;
+layout(location = 0) out vec2 texcoords;
 void main() {
   tint_symbol_2 inputs;
   inputs.VertexIndex = uint(gl_VertexID);
@@ -105,8 +105,8 @@ tint_symbol_6 fs_main(tint_symbol_5 tint_symbol_4) {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-in vec2 texcoord;
-out vec4 value;
+layout(location = 0) in vec2 texcoord;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_5 inputs;
   inputs.texcoord = texcoord;
diff --git a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
index 119cf252f8..254e4866c1 100644
--- a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
+++ b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
@@ -49,8 +49,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in vec2 vUV;
-out vec4 value;
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_2 inputs;
   inputs.vUV = vUV;
diff --git a/test/bug/tint/1046.wgsl.expected.glsl b/test/bug/tint/1046.wgsl.expected.glsl
index 4d7308945e..872149f5f6 100644
--- a/test/bug/tint/1046.wgsl.expected.glsl
+++ b/test/bug/tint/1046.wgsl.expected.glsl
@@ -59,11 +59,11 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.color = inner_result.color;
   return wrapper_result;
 }
-in vec4 view_position;
-in vec4 normal;
-in vec2 uv;
-in vec4 color;
-out vec4 color;
+layout(location = 0) in vec4 view_position;
+layout(location = 1) in vec4 normal;
+layout(location = 2) in vec2 uv;
+layout(location = 3) in vec4 color;
+layout(location = 0) out vec4 color;
 void main() {
   tint_symbol_3 inputs;
   inputs.view_position = view_position;
diff --git a/test/bug/tint/1076.wgsl.expected.glsl b/test/bug/tint/1076.wgsl.expected.glsl
index 706f82fcc5..659072c4e9 100644
--- a/test/bug/tint/1076.wgsl.expected.glsl
+++ b/test/bug/tint/1076.wgsl.expected.glsl
@@ -33,9 +33,9 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.mask = inner_result.mask;
   return wrapper_result;
 }
-in float a;
-in float b;
-out float a;
+layout(location = 0) in float a;
+layout(location = 1) in float b;
+layout(location = 0) out float a;
 void main() {
   tint_symbol_3 inputs;
   inputs.a = a;
diff --git a/test/bug/tint/1081.wgsl.expected.glsl b/test/bug/tint/1081.wgsl.expected.glsl
index b49445bb30..3637e846c7 100644
--- a/test/bug/tint/1081.wgsl.expected.glsl
+++ b/test/bug/tint/1081.wgsl.expected.glsl
@@ -34,8 +34,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in ivec3 x;
-out int value;
+layout(location = 1) in ivec3 x;
+layout(location = 2) out int value;
 void main() {
   tint_symbol_2 inputs;
   inputs.x = x;
diff --git a/test/bug/tint/1088.spvasm.expected.glsl b/test/bug/tint/1088.spvasm.expected.glsl
index 38a4ce4956..47cd0f2e06 100644
--- a/test/bug/tint/1088.spvasm.expected.glsl
+++ b/test/bug/tint/1088.spvasm.expected.glsl
@@ -77,10 +77,10 @@ tint_symbol_4 tint_symbol_1(tint_symbol_3 tint_symbol_2) {
   wrapper_result.vUV_1 = inner_result.vUV_1;
   return wrapper_result;
 }
-in vec3 position_param;
-in vec3 normal_param;
-in vec2 uv_param;
-out vec2 vUV_1;
+layout(location = 0) in vec3 position_param;
+layout(location = 1) in vec3 normal_param;
+layout(location = 2) in vec2 uv_param;
+layout(location = 0) out vec2 vUV_1;
 void main() {
   tint_symbol_3 inputs;
   inputs.position_param = position_param;
diff --git a/test/bug/tint/749.spvasm.expected.glsl b/test/bug/tint/749.spvasm.expected.glsl
index 5c9f099e88..d7b04686e3 100644
--- a/test/bug/tint/749.spvasm.expected.glsl
+++ b/test/bug/tint/749.spvasm.expected.glsl
@@ -1566,7 +1566,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/bug/tint/824.wgsl.expected.glsl b/test/bug/tint/824.wgsl.expected.glsl
index c8179b140f..988fbabb52 100644
--- a/test/bug/tint/824.wgsl.expected.glsl
+++ b/test/bug/tint/824.wgsl.expected.glsl
@@ -31,7 +31,7 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.color = inner_result.color;
   return wrapper_result;
 }
-out vec4 color;
+layout(location = 0) out vec4 color;
 void main() {
   tint_symbol_3 inputs;
   inputs.VertexIndex = uint(gl_VertexID);
diff --git a/test/bug/tint/922.wgsl.expected.glsl b/test/bug/tint/922.wgsl.expected.glsl
index 43eee10627..24523d98d7 100644
--- a/test/bug/tint/922.wgsl.expected.glsl
+++ b/test/bug/tint/922.wgsl.expected.glsl
@@ -161,13 +161,13 @@ tint_symbol_4 tint_symbol_1(tint_symbol_3 tint_symbol_2) {
   wrapper_result.member = inner_result.member;
   return wrapper_result;
 }
-in vec3 a_Position;
-in vec2 a_UV;
-in vec4 a_Color;
-in vec3 a_Normal;
-in float a_PosMtxIdx;
-out vec4 v_Color;
-out vec2 v_TexCoord;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_UV;
+layout(location = 2) in vec4 a_Color;
+layout(location = 3) in vec3 a_Normal;
+layout(location = 4) in float a_PosMtxIdx;
+layout(location = 0) out vec4 v_Color;
+layout(location = 1) out vec2 v_TexCoord;
 void main() {
   tint_symbol_3 inputs;
   inputs.a_Position = a_Position;
diff --git a/test/bug/tint/948.wgsl.expected.glsl b/test/bug/tint/948.wgsl.expected.glsl
index 31dc5e12e5..2f57e3b712 100644
--- a/test/bug/tint/948.wgsl.expected.glsl
+++ b/test/bug/tint/948.wgsl.expected.glsl
@@ -205,13 +205,13 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.glFragColor_1 = inner_result.glFragColor_1;
   return wrapper_result;
 }
-in vec3 vPosition_param;
-in vec2 vUV_param;
-in vec2 tUV_param;
-in vec2 stageUnits_1_param;
-in vec2 levelUnits_param;
-in vec2 tileID_1_param;
-out vec4 glFragColor_1;
+layout(location = 0) in vec3 vPosition_param;
+layout(location = 1) in vec2 vUV_param;
+layout(location = 2) in vec2 tUV_param;
+layout(location = 3) in vec2 stageUnits_1_param;
+layout(location = 4) in vec2 levelUnits_param;
+layout(location = 5) in vec2 tileID_1_param;
+layout(location = 0) out vec4 glFragColor_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.vPosition_param = vPosition_param;
diff --git a/test/bug/tint/949.wgsl.expected.glsl b/test/bug/tint/949.wgsl.expected.glsl
index 2467cbbc3f..86ebc8554e 100644
--- a/test/bug/tint/949.wgsl.expected.glsl
+++ b/test/bug/tint/949.wgsl.expected.glsl
@@ -378,11 +378,11 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.glFragColor_1 = inner_result.glFragColor_1;
   return wrapper_result;
 }
-in vec4 v_output1_param;
-in vec2 vMainuv_param;
-in vec4 v_output2_param;
-in vec2 v_uv_param;
-out vec4 glFragColor_1;
+layout(location = 0) in vec4 v_output1_param;
+layout(location = 1) in vec2 vMainuv_param;
+layout(location = 2) in vec4 v_output2_param;
+layout(location = 3) in vec2 v_uv_param;
+layout(location = 0) out vec4 glFragColor_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.v_output1_param = v_output1_param;
diff --git a/test/bug/tint/978.wgsl.expected.glsl b/test/bug/tint/978.wgsl.expected.glsl
index e35f95efa9..3f9b60fe26 100644
--- a/test/bug/tint/978.wgsl.expected.glsl
+++ b/test/bug/tint/978.wgsl.expected.glsl
@@ -32,8 +32,8 @@ tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) {
   wrapper_result.color = inner_result.color;
   return wrapper_result;
 }
-in vec2 vUv;
-out vec4 color;
+layout(location = 2) in vec2 vUv;
+layout(location = 0) out vec4 color;
 void main() {
   tint_symbol_3 inputs;
   inputs.vUv = vUv;
diff --git a/test/bug/tint/992.wgsl.expected.glsl b/test/bug/tint/992.wgsl.expected.glsl
index b9fed97ef1..569029acdf 100644
--- a/test/bug/tint/992.wgsl.expected.glsl
+++ b/test/bug/tint/992.wgsl.expected.glsl
@@ -17,7 +17,7 @@ tint_symbol frag_main() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol outputs;
   outputs = frag_main();
diff --git a/test/expressions/literals/-inf.spvasm.expected.glsl b/test/expressions/literals/-inf.spvasm.expected.glsl
index bf214c6250..77a7f64874 100644
--- a/test/expressions/literals/-inf.spvasm.expected.glsl
+++ b/test/expressions/literals/-inf.spvasm.expected.glsl
@@ -27,7 +27,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1;
   return wrapper_result;
 }
-out vec4 out_var_SV_TARGET_1;
+layout(location = 0) out vec4 out_var_SV_TARGET_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/expressions/literals/inf.spvasm.expected.glsl b/test/expressions/literals/inf.spvasm.expected.glsl
index b06b5f949b..9c7b69fe5a 100644
--- a/test/expressions/literals/inf.spvasm.expected.glsl
+++ b/test/expressions/literals/inf.spvasm.expected.glsl
@@ -27,7 +27,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1;
   return wrapper_result;
 }
-out vec4 out_var_SV_TARGET_1;
+layout(location = 0) out vec4 out_var_SV_TARGET_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/expressions/literals/nan.spvasm.expected.glsl b/test/expressions/literals/nan.spvasm.expected.glsl
index 4ce65a816b..a09810eac6 100644
--- a/test/expressions/literals/nan.spvasm.expected.glsl
+++ b/test/expressions/literals/nan.spvasm.expected.glsl
@@ -27,7 +27,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1;
   return wrapper_result;
 }
-out vec4 out_var_SV_TARGET_1;
+layout(location = 0) out vec4 out_var_SV_TARGET_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/let/global/global.wgsl.expected.glsl b/test/let/global/global.wgsl.expected.glsl
index 188a6dab41..247d694b3f 100644
--- a/test/let/global/global.wgsl.expected.glsl
+++ b/test/let/global/global.wgsl.expected.glsl
@@ -18,7 +18,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/let/inferred/function.wgsl.expected.glsl b/test/let/inferred/function.wgsl.expected.glsl
index 188a6dab41..247d694b3f 100644
--- a/test/let/inferred/function.wgsl.expected.glsl
+++ b/test/let/inferred/function.wgsl.expected.glsl
@@ -18,7 +18,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/samples/compute_boids.wgsl.expected.glsl b/test/samples/compute_boids.wgsl.expected.glsl
index e5f1906247..9ead2674b8 100644
--- a/test/samples/compute_boids.wgsl.expected.glsl
+++ b/test/samples/compute_boids.wgsl.expected.glsl
@@ -45,9 +45,9 @@ tint_symbol_3 vert_main(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in vec2 a_particlePos;
-in vec2 a_particleVel;
-in vec2 a_pos;
+layout(location = 0) in vec2 a_particlePos;
+layout(location = 1) in vec2 a_particleVel;
+layout(location = 2) in vec2 a_pos;
 void main() {
   tint_symbol_2 inputs;
   inputs.a_particlePos = a_particlePos;
@@ -105,7 +105,7 @@ tint_symbol_4 frag_main() {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_4 outputs;
   outputs = frag_main();
diff --git a/test/samples/cube.wgsl.expected.glsl b/test/samples/cube.wgsl.expected.glsl
index 08ec2e80ba..7a37128ddc 100644
--- a/test/samples/cube.wgsl.expected.glsl
+++ b/test/samples/cube.wgsl.expected.glsl
@@ -48,9 +48,9 @@ tint_symbol_4 vtx_main(tint_symbol_3 tint_symbol_2) {
   wrapper_result.Position = inner_result.Position;
   return wrapper_result;
 }
-in vec4 cur_position;
-in vec4 color;
-out vec4 vtxFragColor;
+layout(location = 0) in vec4 cur_position;
+layout(location = 1) in vec4 color;
+layout(location = 0) out vec4 vtxFragColor;
 void main() {
   tint_symbol_3 inputs;
   inputs.cur_position = cur_position;
@@ -102,8 +102,8 @@ tint_symbol_7 frag_main(tint_symbol_6 tint_symbol_5) {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-in vec4 fragColor;
-out vec4 value;
+layout(location = 0) in vec4 fragColor;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_6 inputs;
   inputs.fragColor = fragColor;
diff --git a/test/samples/simple.wgsl.expected.glsl b/test/samples/simple.wgsl.expected.glsl
index 10830b0b54..66efb9ee94 100644
--- a/test/samples/simple.wgsl.expected.glsl
+++ b/test/samples/simple.wgsl.expected.glsl
@@ -20,7 +20,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/samples/triangle.wgsl.expected.glsl b/test/samples/triangle.wgsl.expected.glsl
index 021f431ded..67feb5c996 100644
--- a/test/samples/triangle.wgsl.expected.glsl
+++ b/test/samples/triangle.wgsl.expected.glsl
@@ -57,7 +57,7 @@ tint_symbol_3 frag_main() {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_3 outputs;
   outputs = frag_main();
diff --git a/test/shader_io/fragment_input_locations.wgsl.expected.glsl b/test/shader_io/fragment_input_locations.wgsl.expected.glsl
index b5a0b0ea7f..66c175d5a4 100644
--- a/test/shader_io/fragment_input_locations.wgsl.expected.glsl
+++ b/test/shader_io/fragment_input_locations.wgsl.expected.glsl
@@ -21,10 +21,10 @@ void tint_symbol(tint_symbol_2 tint_symbol_1) {
   tint_symbol_inner(tint_symbol_1.loc0, tint_symbol_1.loc1, tint_symbol_1.loc2, tint_symbol_1.loc3);
   return;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl b/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
index 952f01bb08..54cf564848 100644
--- a/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
+++ b/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
@@ -28,10 +28,10 @@ void tint_symbol(tint_symbol_2 tint_symbol_1) {
   tint_symbol_inner(tint_symbol_3);
   return;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/fragment_input_mixed.wgsl.expected.glsl b/test/shader_io/fragment_input_mixed.wgsl.expected.glsl
index 2b31e3c7ec..3304037e13 100644
--- a/test/shader_io/fragment_input_mixed.wgsl.expected.glsl
+++ b/test/shader_io/fragment_input_mixed.wgsl.expected.glsl
@@ -39,10 +39,10 @@ void tint_symbol(tint_symbol_2 tint_symbol_1) {
   tint_symbol_inner(tint_symbol_3, tint_symbol_1.front_facing, tint_symbol_1.loc1, tint_symbol_1.sample_index, tint_symbol_4, tint_symbol_1.loc2);
   return;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/fragment_output_locations.wgsl.expected.glsl b/test/shader_io/fragment_output_locations.wgsl.expected.glsl
index 61bf161dad..74baed1166 100644
--- a/test/shader_io/fragment_output_locations.wgsl.expected.glsl
+++ b/test/shader_io/fragment_output_locations.wgsl.expected.glsl
@@ -25,7 +25,7 @@ tint_symbol main0() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out int value;
+layout(location = 0) out int value;
 void main() {
   tint_symbol outputs;
   outputs = main0();
@@ -60,7 +60,7 @@ tint_symbol_1 main1() {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-out uint value;
+layout(location = 1) out uint value;
 void main() {
   tint_symbol_1 outputs;
   outputs = main1();
@@ -95,7 +95,7 @@ tint_symbol_2 main2() {
   wrapper_result_2.value = inner_result_2;
   return wrapper_result_2;
 }
-out float value;
+layout(location = 2) out float value;
 void main() {
   tint_symbol_2 outputs;
   outputs = main2();
@@ -129,7 +129,7 @@ tint_symbol_3 main3() {
   wrapper_result_3.value = inner_result_3;
   return wrapper_result_3;
 }
-out vec4 value;
+layout(location = 3) out vec4 value;
 void main() {
   tint_symbol_3 outputs;
   outputs = main3();
diff --git a/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl b/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
index 5c70910864..76a61711e2 100644
--- a/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
+++ b/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
@@ -28,10 +28,10 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.loc3 = inner_result.loc3;
   return wrapper_result;
 }
-out int loc0;
-out uint loc1;
-out float loc2;
-out vec4 loc3;
+layout(location = 0) out int loc0;
+layout(location = 1) out uint loc1;
+layout(location = 2) out float loc2;
+layout(location = 3) out vec4 loc3;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/shader_io/fragment_output_mixed.wgsl.expected.glsl b/test/shader_io/fragment_output_mixed.wgsl.expected.glsl
index 7b7563036b..d6ae60432a 100644
--- a/test/shader_io/fragment_output_mixed.wgsl.expected.glsl
+++ b/test/shader_io/fragment_output_mixed.wgsl.expected.glsl
@@ -36,10 +36,10 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.loc3 = inner_result.loc3;
   return wrapper_result;
 }
-out int loc0;
-out uint loc1;
-out float loc2;
-out vec4 loc3;
+layout(location = 0) out int loc0;
+layout(location = 1) out uint loc1;
+layout(location = 2) out float loc2;
+layout(location = 3) out vec4 loc3;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl b/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl
index afc61643b3..73269ca842 100644
--- a/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl
+++ b/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl
@@ -19,14 +19,14 @@ void tint_symbol(tint_symbol_3 tint_symbol_2) {
   tint_symbol_inner(tint_symbol_2.none, tint_symbol_2.tint_symbol_1, tint_symbol_2.perspective_center, tint_symbol_2.perspective_centroid, tint_symbol_2.perspective_sample, tint_symbol_2.linear_center, tint_symbol_2.linear_centroid, tint_symbol_2.linear_sample);
   return;
 }
-in float none;
-in float tint_symbol_1;
-in float perspective_center;
-in float perspective_centroid;
-in float perspective_sample;
-in float linear_center;
-in float linear_centroid;
-in float linear_sample;
+layout(location = 0) in float none;
+layout(location = 1) in float tint_symbol_1;
+layout(location = 2) in float perspective_center;
+layout(location = 3) in float perspective_centroid;
+layout(location = 4) in float perspective_sample;
+layout(location = 5) in float linear_center;
+layout(location = 6) in float linear_centroid;
+layout(location = 7) in float linear_sample;
 void main() {
   tint_symbol_3 inputs;
   inputs.none = none;
diff --git a/test/shader_io/interpolate_input_struct.wgsl.expected.glsl b/test/shader_io/interpolate_input_struct.wgsl.expected.glsl
index 697f4ca9dc..b5aa84ceb7 100644
--- a/test/shader_io/interpolate_input_struct.wgsl.expected.glsl
+++ b/test/shader_io/interpolate_input_struct.wgsl.expected.glsl
@@ -30,14 +30,14 @@ void tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   tint_symbol_1_inner(tint_symbol_5);
   return;
 }
-in float none;
-in float tint_symbol;
-in float perspective_center;
-in float perspective_centroid;
-in float perspective_sample;
-in float linear_center;
-in float linear_centroid;
-in float linear_sample;
+layout(location = 0) in float none;
+layout(location = 1) in float tint_symbol;
+layout(location = 2) in float perspective_center;
+layout(location = 3) in float perspective_centroid;
+layout(location = 4) in float perspective_sample;
+layout(location = 5) in float linear_center;
+layout(location = 6) in float linear_centroid;
+layout(location = 7) in float linear_sample;
 void main() {
   tint_symbol_4 inputs;
   inputs.none = none;
diff --git a/test/shader_io/interpolate_integers.wgsl.expected.glsl b/test/shader_io/interpolate_integers.wgsl.expected.glsl
index 1bb1c04cdf..721460e3b6 100644
--- a/test/shader_io/interpolate_integers.wgsl.expected.glsl
+++ b/test/shader_io/interpolate_integers.wgsl.expected.glsl
@@ -44,10 +44,10 @@ tint_symbol vert_main() {
   wrapper_result.pos = inner_result.pos;
   return wrapper_result;
 }
-out int i;
-out uint u;
-out ivec4 vi;
-out uvec4 vu;
+layout(location = 0) out int i;
+layout(location = 1) out uint u;
+layout(location = 2) out ivec4 vi;
+layout(location = 3) out uvec4 vu;
 void main() {
   tint_symbol outputs;
   outputs = vert_main();
@@ -99,11 +99,11 @@ tint_symbol_3 frag_main(tint_symbol_2 tint_symbol_1) {
   wrapper_result_1.value = inner_result_1;
   return wrapper_result_1;
 }
-in int i;
-in uint u;
-in ivec4 vi;
-in uvec4 vu;
-out int value;
+layout(location = 0) in int i;
+layout(location = 1) in uint u;
+layout(location = 2) in ivec4 vi;
+layout(location = 3) in uvec4 vu;
+layout(location = 0) out int value;
 void main() {
   tint_symbol_2 inputs;
   inputs.i = i;
diff --git a/test/shader_io/interpolate_return_struct.wgsl.expected.glsl b/test/shader_io/interpolate_return_struct.wgsl.expected.glsl
index 377353002e..f4ed345e18 100644
--- a/test/shader_io/interpolate_return_struct.wgsl.expected.glsl
+++ b/test/shader_io/interpolate_return_struct.wgsl.expected.glsl
@@ -43,14 +43,14 @@ tint_symbol_2 tint_symbol_1() {
   wrapper_result.linear_sample = inner_result.linear_sample;
   return wrapper_result;
 }
-out float none;
-out float tint_symbol;
-out float perspective_center;
-out float perspective_centroid;
-out float perspective_sample;
-out float linear_center;
-out float linear_centroid;
-out float linear_sample;
+layout(location = 0) out float none;
+layout(location = 1) out float tint_symbol;
+layout(location = 2) out float perspective_center;
+layout(location = 3) out float perspective_centroid;
+layout(location = 4) out float perspective_sample;
+layout(location = 5) out float linear_center;
+layout(location = 6) out float linear_centroid;
+layout(location = 7) out float linear_sample;
 void main() {
   tint_symbol_2 outputs;
   outputs = tint_symbol_1();
diff --git a/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl b/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl
index 79262421aa..d449567ffb 100644
--- a/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl
+++ b/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl
@@ -31,8 +31,8 @@ tint_symbol vert_main() {
   wrapper_result.pos = inner_result.pos;
   return wrapper_result;
 }
-out float col1;
-out float col2;
+layout(location = 1) out float col1;
+layout(location = 2) out float col2;
 void main() {
   tint_symbol outputs;
   outputs = vert_main();
@@ -72,8 +72,8 @@ void frag_main(tint_symbol_2 tint_symbol_1) {
   frag_main_inner(tint_symbol_3);
   return;
 }
-in float col1;
-in float col2;
+layout(location = 1) in float col1;
+layout(location = 2) in float col2;
 void main() {
   tint_symbol_2 inputs;
   inputs.col1 = col1;
diff --git a/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl b/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl
index 63a9342d88..c94bcbdd26 100644
--- a/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl
+++ b/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl
@@ -32,7 +32,7 @@ tint_symbol vert_main1() {
   wrapper_result.loc0 = inner_result.loc0;
   return wrapper_result;
 }
-out int loc0;
+layout(location = 0) out int loc0;
 void main() {
   tint_symbol outputs;
   outputs = vert_main1();
@@ -75,7 +75,7 @@ tint_symbol_1 vert_main2() {
   wrapper_result_1.loc0 = inner_result_1.loc0;
   return wrapper_result_1;
 }
-out int loc0;
+layout(location = 0) out int loc0;
 void main() {
   tint_symbol_1 outputs;
   outputs = vert_main2();
diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
index 2886e0cd06..bf83ef359c 100644
--- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
+++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
@@ -33,8 +33,8 @@ void frag_main(tint_symbol_3 tint_symbol_2) {
   frag_main_inner(tint_symbol_4);
   return;
 }
-in float f;
-in uint u;
+layout(location = 0) in float f;
+layout(location = 1) in uint u;
 void main() {
   tint_symbol_3 inputs;
   inputs.f = f;
diff --git a/test/shader_io/vertex_input_locations.wgsl.expected.glsl b/test/shader_io/vertex_input_locations.wgsl.expected.glsl
index 4a1499a46f..007b65529e 100644
--- a/test/shader_io/vertex_input_locations.wgsl.expected.glsl
+++ b/test/shader_io/vertex_input_locations.wgsl.expected.glsl
@@ -25,10 +25,10 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl b/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
index 21dfce3f2c..5868fead59 100644
--- a/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
+++ b/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
@@ -32,10 +32,10 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/vertex_input_mixed.wgsl.expected.glsl b/test/shader_io/vertex_input_mixed.wgsl.expected.glsl
index e1e518d02c..ce5652eddb 100644
--- a/test/shader_io/vertex_input_mixed.wgsl.expected.glsl
+++ b/test/shader_io/vertex_input_mixed.wgsl.expected.glsl
@@ -38,10 +38,10 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-in int loc0;
-in uint loc1;
-in float loc2;
-in vec4 loc3;
+layout(location = 0) in int loc0;
+layout(location = 1) in uint loc1;
+layout(location = 2) in float loc2;
+layout(location = 3) in vec4 loc3;
 void main() {
   tint_symbol_2 inputs;
   inputs.loc0 = loc0;
diff --git a/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl b/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
index 13ead493d7..0a758bcc6a 100644
--- a/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
+++ b/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
@@ -31,10 +31,10 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.position = inner_result.position;
   return wrapper_result;
 }
-out int loc0;
-out uint loc1;
-out float loc2;
-out vec4 loc3;
+layout(location = 0) out int loc0;
+layout(location = 1) out uint loc1;
+layout(location = 2) out float loc2;
+layout(location = 3) out vec4 loc3;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_IOLocations.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_IOLocations.spvasm.expected.glsl
index 8eee853d23..d4c764d2b6 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_IOLocations.spvasm.expected.glsl
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_IOLocations.spvasm.expected.glsl
@@ -40,10 +40,10 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in uint x_1_param;
-in uint x_3_param;
-out uint x_2_1;
-out uint x_4_1;
+layout(location = 0) in uint x_1_param;
+layout(location = 30) in uint x_3_param;
+layout(location = 0) out uint x_2_1;
+layout(location = 6) out uint x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_1_param = x_1_param;
diff --git a/test/var/inferred/function.wgsl.expected.glsl b/test/var/inferred/function.wgsl.expected.glsl
index 188a6dab41..247d694b3f 100644
--- a/test/var/inferred/function.wgsl.expected.glsl
+++ b/test/var/inferred/function.wgsl.expected.glsl
@@ -18,7 +18,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.value = inner_result;
   return wrapper_result;
 }
-out vec4 value;
+layout(location = 0) out vec4 value;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl
index 350b54075a..1605c6e4b9 100644
--- a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl
@@ -213,7 +213,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl
index 4399f09319..735eacb706 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl
@@ -81,7 +81,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl
index fccb658276..eab9dfd06e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl
@@ -90,7 +90,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl
index 330e0387a2..5d3dffbb8c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl
@@ -116,7 +116,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl
index b66d418b4c..2af44269c0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl
@@ -39,7 +39,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl
index e6b95ce6cd..bc06be4507 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl
@@ -73,7 +73,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl
index 91e5a32170..22ee75e64a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl
@@ -77,7 +77,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl
index 0c4b966466..dd92a4a544 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl
@@ -87,7 +87,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl
index 46d8d26e7c..24777225d1 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl
@@ -95,7 +95,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl
index 03e7a1598a..2cc843f881 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl
@@ -81,7 +81,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl
index e342a8723c..9c7a237592 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl
@@ -85,7 +85,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl
index 772e0cc05e..67a16e80d7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl
@@ -145,7 +145,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl
index fbfe7db643..fadacdd9e8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl
@@ -157,7 +157,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl
index 6aadfa9233..56aa8c4368 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl
@@ -45,7 +45,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl
index 3fedb7e0de..4634aff4b6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl
@@ -52,7 +52,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl
index a6959c5a08..85ecb2fb8f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl
@@ -35,7 +35,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl
index 44e0b9e666..1406cee22c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl
@@ -67,7 +67,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl
index 40859311c7..4a0c00a09d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl
@@ -71,7 +71,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl
index 80f91e5e37..c3ee65acc8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl
@@ -97,7 +97,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl
index 15b4081cad..1a820256c2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl
@@ -105,7 +105,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl
index 26f07aae65..6d1de6faf7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl
@@ -36,7 +36,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl
index 7c50a5769b..13968b5a15 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl
@@ -35,7 +35,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl
index db352d2de9..552eb47d7b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl
@@ -50,7 +50,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl
index 8ffa57541a..49338f435c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl
@@ -39,7 +39,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl
index 12d6dcf342..38c14a428e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl
@@ -76,7 +76,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl
index 82afd88b7a..369310e6d0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl
@@ -43,7 +43,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl
index 59134fcbf6..9144fcdd41 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl
@@ -43,7 +43,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl
index c273c0b847..2910942bac 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl
@@ -43,7 +43,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl
index 9f8169ef60..9f440ea331 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl
@@ -41,7 +41,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl
index 9f8169ef60..9f440ea331 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl
@@ -41,7 +41,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl
index 00b8169c52..510663e6ff 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl
@@ -46,7 +46,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl
index 00b8169c52..510663e6ff 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl
@@ -46,7 +46,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl
index 631f881404..f0f1cf1a40 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl
@@ -68,7 +68,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl
index 108a63b687..2bb14f4691 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl
@@ -76,7 +76,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl
index 5df889b0b0..ab9adac4e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl
@@ -70,7 +70,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl
index 7d6df8ffef..75f393f688 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl
@@ -74,7 +74,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl
index 0c368eb401..36cf34820f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl
@@ -82,7 +82,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl
index 4fd5731a73..2deb26f5a5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl
@@ -104,7 +104,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl
index bd6f6a5bf2..44654ec7a0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl
@@ -125,7 +125,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl
index 28d936a5f6..4fc9b78ba7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl
@@ -133,7 +133,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl
index b438ac44a6..e5465c40b3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl
@@ -92,7 +92,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl
index 68329c501d..f0ee59e43e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl
@@ -100,7 +100,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl
index 61f4a60934..3906e28c66 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl
@@ -117,7 +117,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl
index 2d19c3975c..d68afc122a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl
@@ -125,7 +125,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl
index 92875563dc..80e791748c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl
@@ -105,7 +105,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl
index 86f616c86b..1c7c936112 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl
@@ -113,7 +113,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl
index add7f7fbff..9798a36467 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl
@@ -116,7 +116,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl
index ac54d67acf..a2e6745eba 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl
@@ -124,7 +124,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl
index 146f9a22f5..2e9cbc657d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl
@@ -118,7 +118,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl
index bbb0c8b44a..656591a630 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl
@@ -126,7 +126,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl
index 971f64ab55..c617aca308 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl
@@ -49,7 +49,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl
index 6b6d4896d1..74c411b488 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl
@@ -53,7 +53,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl
index 50486de39e..db649115d2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl
@@ -69,7 +69,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl
index f8e4836d52..27129eb9c5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl
@@ -69,7 +69,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl
index 0feee82657..aa0726aed2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl
@@ -100,7 +100,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl
index b22034fcdd..57f296ee10 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl
@@ -92,7 +92,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl
index cfe03a48c2..fa517eb10a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl
@@ -100,7 +100,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl
index 03e10a5fe2..48c53c7010 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl
@@ -107,7 +107,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl
index 56e569945b..0d7a2eb7ad 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl
@@ -57,7 +57,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl
index 243be09b60..5e51f3a421 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl
@@ -86,7 +86,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl
index b6f12023c8..56629c29ec 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl
@@ -90,7 +90,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl
index 038e115472..b3de8a20c5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl
@@ -55,7 +55,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl
index 1adabe453f..e00f89c56e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl
@@ -142,7 +142,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl
index aca143249a..58dfe069cd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl
@@ -127,7 +127,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl
index 1bb1ef7da4..65c6d5517f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl
@@ -135,7 +135,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl
index cf68f0f4ac..ed4dc9c45d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl
@@ -56,7 +56,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl
index 377b1768b5..c80dc4e5c1 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl
@@ -55,7 +55,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl
index 6dc55582ce..393fe7d9d9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl
@@ -95,7 +95,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl
index b14a632f18..a4f221a387 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl
@@ -70,7 +70,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl
index 17f021c301..24ec5dff6f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl
@@ -51,7 +51,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl
index c484a7ac75..e794c8e907 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl
@@ -55,7 +55,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl
index 14f9f57608..4256c8da32 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl
@@ -37,7 +37,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl
index 675c1f71f6..30fff29d41 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl
@@ -69,7 +69,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl
index cfa44f8a6b..ebe7dbbfc6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl
@@ -77,7 +77,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl
index 087d8484a1..65bdceb278 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl
@@ -85,7 +85,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl
index 44817ec70b..786f88619c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl
@@ -97,7 +97,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl
index 4e1a68053c..3971f3f330 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl
@@ -110,7 +110,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl
index 415cce0666..5abddefce5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl
@@ -118,7 +118,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl
index 3a914ca62a..487eaea6ff 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl
@@ -106,7 +106,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl
index 57b760ad65..b83041092e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl
@@ -40,7 +40,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl
index 57b760ad65..b83041092e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl
@@ -40,7 +40,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl
index e552f1d58c..945dc4975c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl
@@ -81,7 +81,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl
index b97d86044f..bf63f9ea2a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl
@@ -89,7 +89,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl
index 6fb4a0e489..078c224bf8 100644
--- a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl
@@ -76,7 +76,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl
index 623f7f4e24..47d78acf76 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl
@@ -94,7 +94,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl
index e8123dc62b..41cca8ea43 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl
@@ -275,7 +275,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl
index 01f526edaa..40315bb4c7 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl
@@ -285,7 +285,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl
index 1bffc882b6..ffda297205 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl
@@ -279,7 +279,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl
index 0c4cf31dfb..fe16a6a1df 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl
@@ -360,7 +360,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl
index e10289b1b6..fa22365366 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl
@@ -356,7 +356,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl
index 0fc7e67e96..b5e48e6a04 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl
@@ -272,7 +272,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl
index 4352d15e4b..49ee1dc3b2 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl
@@ -292,7 +292,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl
index 824bd13f8b..2619164a56 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl
@@ -377,7 +377,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl
index a2c4833574..42aee8b008 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl
@@ -376,7 +376,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl
index b897f351d4..66ac7cde9c 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl
@@ -273,7 +273,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl
index 6aabbcee62..0ecdb4f3f3 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl
@@ -267,7 +267,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl
index c4b5778a3c..0bfdbfc86b 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl
@@ -103,7 +103,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl
index c4bb170bca..db9c3c5113 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl
@@ -117,7 +117,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl
index b732d6e297..b64990fc0c 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl
@@ -133,7 +133,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl
index 9faf652fb1..cc9f2607e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl
@@ -108,7 +108,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl
index 5515ee81d9..eb807cbf5b 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl
@@ -306,7 +306,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl
index 668db46497..8788750eb4 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl
@@ -361,7 +361,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl
index b951f6da23..3e67fa4d2a 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl
@@ -282,7 +282,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl
index 1023ec7490..6b97d17d5d 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl
@@ -155,7 +155,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl
index 1023ec7490..6b97d17d5d 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl
@@ -155,7 +155,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl
index 586b41d19a..4d1a5a351d 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl
@@ -137,7 +137,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl
index 586b41d19a..4d1a5a351d 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl
@@ -137,7 +137,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl
index 146bb499f2..e90392217f 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl
@@ -164,7 +164,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl
index 146bb499f2..e90392217f 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl
@@ -164,7 +164,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl
index 58b6985e34..291d3a6055 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl
@@ -137,7 +137,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl
index 625593a1df..6e9922357e 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl
@@ -140,7 +140,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl
index 625593a1df..6e9922357e 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl
@@ -140,7 +140,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl
index a41fe7577f..928b29de69 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl
@@ -182,7 +182,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl
index a41fe7577f..928b29de69 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl
@@ -182,7 +182,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl
index c2d5431b07..5c12b8b4a9 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl
@@ -88,7 +88,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl
index 8a642850b9..851ada1d53 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl
@@ -363,7 +363,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl
index f3ab85876c..acb8eb2d79 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl
@@ -78,7 +78,7 @@ tint_symbol_1 tint_symbol() {
   wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
   return wrapper_result;
 }
-out vec4 x_GLF_color_1;
+layout(location = 0) out vec4 x_GLF_color_1;
 void main() {
   tint_symbol_1 outputs;
   outputs = tint_symbol();
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl
index bf6ae726bf..f8c14c2404 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl
@@ -44,8 +44,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl
index bf6ae726bf..f8c14c2404 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl
@@ -44,8 +44,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.spvasm.expected.glsl
index 9d119bbde6..3eb1c86409 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.spvasm.expected.glsl
@@ -40,8 +40,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl
index 9d119bbde6..3eb1c86409 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl
@@ -40,8 +40,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl
index f01d6d3e6b..5fdcb38745 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl
@@ -40,7 +40,7 @@ tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) {
   wrapper_result.out_data_1 = inner_result.out_data_1;
   return wrapper_result;
 }
-out int out_data_1;
+layout(location = 0) out int out_data_1;
 void main() {
   tint_symbol_4 inputs;
   inputs.tint_symbol_2 = gl_FragCoord;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.spvasm.expected.glsl
index 905ff1d36b..c882569476 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.spvasm.expected.glsl
@@ -41,8 +41,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl
index 905ff1d36b..c882569476 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl
@@ -41,8 +41,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl
index 1a50997cc8..fd2d665714 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl
@@ -50,8 +50,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl
index d8925c59c5..b57985acb4 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl
@@ -54,8 +54,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl
index 839eaae26d..f7a6319d1f 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl
@@ -51,8 +51,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl
index e0d5697b9c..e3024bfa13 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl
@@ -55,8 +55,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.spvasm.expected.glsl
index bb321ca2e6..89108cf440 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.spvasm.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.spvasm.expected.glsl
@@ -55,8 +55,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl
index bb321ca2e6..89108cf440 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl
@@ -55,8 +55,8 @@ tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) {
   wrapper_result.x_4_1 = inner_result.x_4_1;
   return wrapper_result;
 }
-in int x_3_param;
-out int x_4_1;
+layout(location = 0) in int x_3_param;
+layout(location = 0) out int x_4_1;
 void main() {
   tint_symbol_2 inputs;
   inputs.x_3_param = x_3_param;