GLSL: move entry point handling to CanonicalizeEntryPointIO transform.

Move builtin_to_string() and builtin_type() to
the CanonicalizeEntryPointIO transform. Use the former to
rename entry point IO variables to the gl_ names, and the latter
to cast values to the correct type.

Change-Id: Iddfad574ddd660ff1bfd89a399a001b967b6b67e
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78380
Reviewed-by: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

test/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   mat3 a = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f));
   mat3 b = mat3(vec3(-1.0f, -2.0f, -3.0f), vec3(-4.0f, -5.0f, -6.0f), vec3(-7.0f, -8.0f, -9.0f));
   mat3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-scalar/f32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float r = (1.0f + 2.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 + 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u + 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 4.0f;
   vec3 b = vec3(1.0f, 2.0f, 3.0f);
   vec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(1, 2, 3);
   ivec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(1u, 2u, 3u);
   uvec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-scalar/f32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 r = (a + 4.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 r = (a + 4);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 r = (a + 4u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(4.0f, 5.0f, 6.0f);
   vec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/add/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a + b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 & 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u & 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a & b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a & b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 | 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u | 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a | b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a | b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 ^ 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u ^ 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a ^ b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a ^ b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-scalar/f32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float r = (1.0f / 2.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 / 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u / 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 4.0f;
   vec3 b = vec3(1.0f, 2.0f, 3.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(1, 2, 3);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(1u, 2u, 3u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-scalar/f32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 r = (a / 4.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 r = (a / 4);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 r = (a / 4u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(4.0f, 5.0f, 6.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float r = (1.0f / 0.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 / 0);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u / 0u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 4.0f;
   vec3 b = vec3(0.0f, 2.0f, 0.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(0, 2, 0);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(0u, 2u, 0u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 r = (a / 0.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 r = (a / 0);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 r = (a / 0u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(0.0f, 5.0f, 0.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(0, 5, 0);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(0u, 5u, 0u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 1.0f;
   float b = 0.0f;
   float r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 1;
   int b = 0;
   int r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 1u;
   uint b = 0u;
   uint r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 4.0f;
   vec3 b = vec3(0.0f, 2.0f, 0.0f);
   vec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(0, 2, 0);
   ivec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(0u, 2u, 0u);
   uvec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-scalar/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   float b = 0.0f;
   vec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   int b = 0;
   ivec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uint b = 0u;
   uvec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(0.0f, 5.0f, 0.0f);
   vec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(0, 5, 0);
   ivec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(0u, 5u, 0u);
   uvec3 r = (a / (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 1.0f;
   float b = 0.0f;
   float r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 1;
   int b = 0;
   int r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 1u;
   uint b = 0u;
   uint r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 4.0f;
   vec3 b = vec3(0.0f, 2.0f, 0.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(0, 2, 0);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(0u, 2u, 0u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   float b = 0.0f;
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   int b = 0;
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uint b = 0u;
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(0.0f, 5.0f, 0.0f);
   vec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(0, 5, 0);
   ivec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(0u, 5u, 0u);
   uvec3 r = (a / b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 << 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u << 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   uvec3 b = uvec3(4u, 5u, 6u);
   ivec3 r = (a << b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a << b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.glsl

@@ -3,19 +3,18 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float r = (1.0f % 2.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-
 Error parsing GLSL shader:
-ERROR: 0:6: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion)
-ERROR: 0:6: '' : compilation terminated 
+ERROR: 0:5: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion)
+ERROR: 0:5: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 
 

test/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 % 2);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u % 2u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.glsl

@@ -3,21 +3,20 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(4.0f, 5.0f, 6.0f);
   vec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-
 Error parsing GLSL shader:
-ERROR: 0:8: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion)
-ERROR: 0:8: '' : compilation terminated 
+ERROR: 0:7: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion)
+ERROR: 0:7: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 
 

test/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(4, 5, 6);
   ivec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(4u, 5u, 6u);
   uvec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl

@@ -3,19 +3,18 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float r = (1.0f % 0.0f);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-
 Error parsing GLSL shader:
-ERROR: 0:6: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion)
-ERROR: 0:6: '' : compilation terminated 
+ERROR: 0:5: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion)
+ERROR: 0:5: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 
 

test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int r = (1 % 0);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,13 +1,12 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint r = (1u % 0u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(0, 2, 0);
   ivec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(0u, 2u, 0u);
   uvec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 r = (a % 0);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,14 +1,13 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 r = (a % 0u);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl

@@ -3,21 +3,20 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   vec3 a = vec3(1.0f, 2.0f, 3.0f);
   vec3 b = vec3(0.0f, 5.0f, 0.0f);
   vec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-
 Error parsing GLSL shader:
-ERROR: 0:8: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion)
-ERROR: 0:8: '' : compilation terminated 
+ERROR: 0:7: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion)
+ERROR: 0:7: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 
 

test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   ivec3 b = ivec3(0, 5, 0);
   ivec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uvec3 b = uvec3(0u, 5u, 0u);
   uvec3 r = (a % b);
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl

@@ -3,21 +3,20 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   float a = 1.0f;
   float b = 0.0f;
   float r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-
 Error parsing GLSL shader:
-ERROR: 0:8: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion)
-ERROR: 0:8: '' : compilation terminated 
+ERROR: 0:7: '%' :  wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion)
+ERROR: 0:7: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 
 

test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 1;
   int b = 0;
   int r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 1u;
   uint b = 0u;
   uint r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   int a = 4;
   ivec3 b = ivec3(0, 2, 0);
   ivec3 r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uint a = 4u;
   uvec3 b = uvec3(0u, 2u, 0u);
   uvec3 r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   ivec3 a = ivec3(1, 2, 3);
   int b = 0;
   ivec3 r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-

test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl

@@ -1,15 +1,14 @@
 #version 310 es
 precision mediump float;
 
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void f() {
   uvec3 a = uvec3(1u, 2u, 3u);
   uint b = 0u;
   uvec3 r = (a % (b + b));
-  return;
 }
 
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   f();
+  return;
 }
-