GLSL: add location layout qualifier before in/out variables.

Bug: tint:1398
Change-Id: I89c985d01d539ed166661ee5e858247cde4702b3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78080
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

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,

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);

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;

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;

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;

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;

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();

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();

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();

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();

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();

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();

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();

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;

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();

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();

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;

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;

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;

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();

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();

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();

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;

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;

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;

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();

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;

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();

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;

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;

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;

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;

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();

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;

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();

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;

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();

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();

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();

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();

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();

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();

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;

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;

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();

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();

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;

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;

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();

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();

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();

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();

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();

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();

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();

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();

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();

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;

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;

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();

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();

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();

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();

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();

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();

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();

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();

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;

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;

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();

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();

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();

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();

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();

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();

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;

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;

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();

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();

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();

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();

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();

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();

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();