GLSL: put std430 packing on all buffer variables.

This is not 100% correct (the exceptions for mat2 and friends are not
implemented yet), but gets more tests passing in Dawn.

Bug: tint:1415
Change-Id: Ia11c63a5236f35e724431a65ddb6ef3c598775d0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/79380
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/writer/glsl/generator_impl.cc

@@ -1752,7 +1752,7 @@ bool GeneratorImpl::EmitStorageVariable(const sem::Variable* var) {
     return false;
   }
   ast::VariableBindingPoint bp = decl->BindingPoint();
-  line() << "layout(binding = " << bp.binding->value << ") buffer "
+  line() << "layout(binding = " << bp.binding->value << ", std430) buffer "
          << UniqueIdentifier(StructName(str)) << " {";
   EmitStructMembers(current_buffer_, str);
   auto name = builder_.Symbols().NameFor(decl->symbol);

src/writer/glsl/generator_impl_function_test.cc

@@ -468,7 +468,7 @@ struct Data {
   float b;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   int a;
   float b;
 } coord;
@@ -523,7 +523,7 @@ struct Data {
   float b;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   int a;
   float b;
 } coord;
@@ -574,7 +574,7 @@ struct Data {
   float b;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   int a;
   float b;
 } coord;
@@ -626,7 +626,7 @@ struct Data {
   float b;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   int a;
   float b;
 } coord;
@@ -733,7 +733,7 @@ struct S {
   float x;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   float x;
 } coord;
 float sub_func(float param) {
@@ -980,7 +980,7 @@ struct Data {
   float d;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   float d;
 } data;
 void a() {

src/writer/glsl/generator_impl_member_accessor_test.cc

@@ -299,7 +299,7 @@ struct Data {
   mat2x3 b;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   int a;
   mat2x3 b;
 } data;
@@ -347,7 +347,7 @@ struct Data {
   mat4x3 a;
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   float z;
   mat4x3 a;
 } data;
@@ -393,7 +393,7 @@ struct Data {
   int a[5];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   float z;
   int a[5];
 } data;
@@ -440,7 +440,7 @@ struct Data {
   int a[5];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   float z;
   int a[5];
 } data;
@@ -484,7 +484,7 @@ struct Data {
   int a[5];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   float z;
   int a[5];
 } data;
@@ -543,7 +543,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {
@@ -604,7 +604,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {
@@ -665,7 +665,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {
@@ -726,7 +726,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {
@@ -783,7 +783,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {
@@ -844,7 +844,7 @@ struct Data {
   Inner c[4];
 };
 
-layout(binding = 0) buffer Data_1 {
+layout(binding = 0, std430) buffer Data_1 {
   Inner c[4];
 } data;
 void tint_symbol() {

src/writer/glsl/generator_impl_sanitizer_test.cc

@@ -51,7 +51,7 @@ TEST_F(GlslSanitizerTest, Call_ArrayLength) {
   auto* expect = R"(#version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer my_struct_1 {
+layout(binding = 1, std430) buffer my_struct_1 {
   float a[];
 } b;
 void a_func() {
@@ -99,7 +99,7 @@ TEST_F(GlslSanitizerTest, Call_ArrayLength_OtherMembersInStruct) {
   auto* expect = R"(#version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer my_struct_1 {
+layout(binding = 1, std430) buffer my_struct_1 {
   float z;
   float a[];
 } b;
@@ -150,7 +150,7 @@ TEST_F(GlslSanitizerTest, Call_ArrayLength_ViaLets) {
   auto* expect = R"(#version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer my_struct_1 {
+layout(binding = 1, std430) buffer my_struct_1 {
   float a[];
 } b;
 void a_func() {

test/array/assign_to_function_var.wgsl.expected.glsl

@@ -15,7 +15,7 @@ layout(binding = 0) uniform S_1 {
   ivec4 arr[4];
 } src_uniform;
 
-layout(binding = 1) buffer S_2 {
+layout(binding = 1, std430) buffer S_2 {
   ivec4 arr[4];
 } src_storage;
 ivec4[4] ret_arr() {

test/array/assign_to_private_var.wgsl.expected.glsl

@@ -15,7 +15,7 @@ layout(binding = 0) uniform S_1 {
   ivec4 arr[4];
 } src_uniform;
 
-layout(binding = 1) buffer S_2 {
+layout(binding = 1, std430) buffer S_2 {
   ivec4 arr[4];
 } src_storage;
 ivec4 dst[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));

test/array/assign_to_storage_var.wgsl.expected.glsl

@@ -19,13 +19,13 @@ layout(binding = 0) uniform S_1 {
   ivec4 arr[4];
 } src_uniform;
 
-layout(binding = 1) buffer S_2 {
+layout(binding = 1, std430) buffer S_2 {
   ivec4 arr[4];
 } src_storage;
-layout(binding = 2) buffer S_3 {
+layout(binding = 2, std430) buffer S_3 {
   ivec4 arr[4];
 } dst;
-layout(binding = 3) buffer S_nested_1 {
+layout(binding = 3, std430) buffer S_nested_1 {
   int arr[4][3][2];
 } dst_nested;
 ivec4[4] ret_arr() {

test/array/assign_to_workgroup_var.wgsl.expected.glsl

@@ -15,7 +15,7 @@ layout(binding = 0) uniform S_1 {
   ivec4 arr[4];
 } src_uniform;
 
-layout(binding = 1) buffer S_2 {
+layout(binding = 1, std430) buffer S_2 {
   ivec4 arr[4];
 } src_storage;
 shared ivec4 dst[4];

test/array/strides.spvasm.expected.glsl

@@ -13,7 +13,7 @@ struct S {
   strided_arr_1 a[4];
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   strided_arr_1 a[4];
 } s;
 void f_1() {

test/benchmark/particles.wgsl.expected.glsl

@@ -165,7 +165,7 @@ layout(binding = 0) uniform SimulationParams_1 {
   vec4 seed;
 } sim_params;
 
-layout(binding = 1) buffer Particles_1 {
+layout(binding = 1, std430) buffer Particles_1 {
   Particle particles[];
 } data;
 struct UBO {
@@ -257,10 +257,10 @@ layout(binding = 3) uniform UBO_1 {
   uint width;
 } ubo;
 
-layout(binding = 4) buffer Buffer_1 {
+layout(binding = 4, std430) buffer Buffer_1 {
   float weights[];
 } buf_in;
-layout(binding = 5) buffer Buffer_2 {
+layout(binding = 5, std430) buffer Buffer_2 {
   float weights[];
 } buf_out;
 uniform highp sampler2D tex_in_1;
@@ -315,10 +315,10 @@ layout(binding = 3) uniform UBO_1 {
   uint width;
 } ubo;
 
-layout(binding = 4) buffer Buffer_1 {
+layout(binding = 4, std430) buffer Buffer_1 {
   float weights[];
 } buf_in;
-layout(binding = 5) buffer Buffer_2 {
+layout(binding = 5, std430) buffer Buffer_2 {
   float weights[];
 } buf_out;
 layout(rgba8) uniform highp writeonly image2D tex_out;

test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl

@@ -57,7 +57,7 @@ struct ClusterLightGroup {
   uint indices[1769472];
 };
 
-layout(binding = 1) buffer ClusterLightGroup_1 {
+layout(binding = 1, std430) buffer ClusterLightGroup_1 {
   uint offset;
   ClusterLights lights[27648];
   uint indices[1769472];
@@ -69,7 +69,7 @@ struct Light {
   float intensity;
 };
 
-layout(binding = 2) buffer GlobalLights_1 {
+layout(binding = 2, std430) buffer GlobalLights_1 {
   vec3 ambient;
   vec3 dirColor;
   float dirIntensity;
@@ -94,7 +94,7 @@ uint getClusterIndex(vec4 fragCoord) {
   return ((tile.x + (tile.y * tileCount.x)) + ((tile.z * tileCount.x) * tileCount.y));
 }
 
-layout(binding = 6) buffer LightShadowTable_1 {
+layout(binding = 6, std430) buffer LightShadowTable_1 {
   int light[];
 } lightShadowTable;
 vec2 shadowSampleOffsets[16] = vec2[16](vec2(-1.5f, -1.5f), vec2(-1.5f, -0.5f), vec2(-1.5f, 0.5f), vec2(-1.5f, 1.5f), vec2(-0.5f, -1.5f), vec2(-0.5f, -0.5f), vec2(-0.5f, 0.5f), vec2(-0.5f, 1.5f), vec2(0.5f, -1.5f), vec2(0.5f, -0.5f), vec2(0.5f, 0.5f), vec2(0.5f, 1.5f), vec2(1.5f, -1.5f), vec2(1.5f, -0.5f), vec2(1.5f, 0.5f), vec2(1.5f, 1.5f));
@@ -104,7 +104,7 @@ struct ShadowProperties {
   mat4 viewProj;
 };
 
-layout(binding = 7) buffer LightShadows_1 {
+layout(binding = 7, std430) buffer LightShadows_1 {
   ShadowProperties properties[];
 } shadow;
 uniform highp sampler2D shadowTexture_1;

test/buffer/storage/dynamic_index/read.wgsl.expected.glsl

@@ -13,7 +13,7 @@ struct Inner {
   ivec4 i[4];
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   Inner arr[];
 } s;
 void tint_symbol(uint idx) {

test/buffer/storage/dynamic_index/write.wgsl.expected.glsl

@@ -13,7 +13,7 @@ struct Inner {
   ivec4 i[4];
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   Inner arr[];
 } s;
 void tint_symbol(uint idx) {

test/buffer/storage/static_index/read.wgsl.expected.glsl

@@ -18,7 +18,7 @@ struct S {
   Inner j[4];
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   ivec3 a;
   int b;
   uvec3 c;

test/buffer/storage/static_index/write.wgsl.expected.glsl

@@ -18,7 +18,7 @@ struct S {
   Inner j[4];
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   ivec3 a;
   int b;
   uvec3 c;

test/buffer/storage/types/array.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   float inner[4];
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   float inner[4];
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   float inner[4];
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/f32.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   float inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   float inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   float inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/i32.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   int inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   int inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   int inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/mat2x2.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   mat2 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   mat2 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   mat2 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/mat2x3.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   mat2x3 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   mat2x3 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   mat2x3 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/mat3x2.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   mat3x2 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   mat3x2 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   mat3x2 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/mat4x4.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   mat4 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   mat4 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   mat4 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/runtime_array.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct S {
   float f;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   S inner[];
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   S inner[];
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/struct.wgsl.expected.glsl

@@ -11,10 +11,10 @@ struct S {
   Inner inner;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   Inner inner;
 } tint_symbol;
-layout(binding = 1) buffer S_2 {
+layout(binding = 1, std430) buffer S_2 {
   Inner inner;
 } tint_symbol_1;
 void tint_symbol_2() {
@@ -27,7 +27,7 @@ void main() {
   return;
 }
 Error parsing GLSL shader:
-ERROR: 0:19: 'assign' :  cannot convert from 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}' to 'layout( binding=1 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}'
+ERROR: 0:19: 'assign' :  cannot convert from 'layout( binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{ global mediump float f} inner}' to 'layout( binding=1 column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{ global mediump float f} inner}'
 ERROR: 0:19: '' : compilation terminated 
 ERROR: 2 compilation errors.  No code generated.
 

test/buffer/storage/types/u32.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   uint inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   uint inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   uint inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/vec2.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   ivec2 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   ivec2 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   ivec2 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/vec3.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   uvec3 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   uvec3 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   uvec3 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/buffer/storage/types/vec4.wgsl.expected.glsl

@@ -5,10 +5,10 @@ struct tint_symbol_block {
   vec4 inner;
 };
 
-layout(binding = 0) buffer tint_symbol_block_1 {
+layout(binding = 0, std430) buffer tint_symbol_block_1 {
   vec4 inner;
 } tint_symbol;
-layout(binding = 1) buffer tint_symbol_block_2 {
+layout(binding = 1, std430) buffer tint_symbol_block_2 {
   vec4 inner;
 } tint_symbol_1;
 void tint_symbol_2() {

test/bug/chromium/1273230.wgsl.expected.glsl

@@ -54,19 +54,19 @@ layout(binding = 0) uniform Uniforms_1 {
   vec3 bbMax;
 } uniforms;
 
-layout(binding = 10) buffer U32s_1 {
+layout(binding = 10, std430) buffer U32s_1 {
   uint values[];
 } indices;
-layout(binding = 11) buffer F32s_1 {
+layout(binding = 11, std430) buffer F32s_1 {
   float values[];
 } positions;
-layout(binding = 20) buffer AU32s_1 {
+layout(binding = 20, std430) buffer AU32s_1 {
   uint values[];
 } counters;
-layout(binding = 21) buffer AI32s_1 {
+layout(binding = 21, std430) buffer AI32s_1 {
   int values[];
 } LUT;
-layout(binding = 50) buffer Dbg_1 {
+layout(binding = 50, std430) buffer Dbg_1 {
   uint offsetCounter;
   uint pad0;
   uint pad1;

test/bug/chromium/1290107.wgsl.expected.glsl

@@ -7,7 +7,7 @@ struct S {
   float f;
 };
 
-layout(binding = 0) buffer arr_block_1 {
+layout(binding = 0, std430) buffer arr_block_1 {
   S inner[];
 } arr;
 void tint_symbol() {

test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 void f() {

test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));

test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl

@@ -13,14 +13,14 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 2) buffer Result_1 {
+layout(binding = 2, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 struct SSBO {
   int data[4];
 };
 
-layout(binding = 1) buffer SSBO_1 {
+layout(binding = 1, std430) buffer SSBO_1 {
   int data[4];
 } ssbo;
 void f() {

test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl

@@ -15,7 +15,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 2) buffer Result_1 {
+layout(binding = 2, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 void f() {

test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 shared S s;

test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 void f() {

test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 void x(inout S p) {

test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));

test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));

test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl

@@ -13,14 +13,14 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 2) buffer Result_1 {
+layout(binding = 2, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 struct SSBO {
   int data[4];
 };
 
-layout(binding = 1) buffer SSBO_1 {
+layout(binding = 1, std430) buffer SSBO_1 {
   int data[4];
 } ssbo;
 void f() {

test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl

@@ -17,7 +17,7 @@ struct Result {
   int tint_symbol;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   int tint_symbol;
 } result;
 shared S s;

test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl

@@ -12,7 +12,7 @@ struct Particle {
   vec3 velocity;
 };
 
-layout(binding = 3) buffer Particles_1 {
+layout(binding = 3, std430) buffer Particles_1 {
   Particle p[];
 } particles;
 layout(binding = 4) uniform Simulation_1 {

test/bug/tint/1046.wgsl.expected.glsl

@@ -26,7 +26,7 @@ layout(binding = 0) uniform Uniforms_1 {
   vec4 color;
 } uniforms;
 
-layout(binding = 1) buffer PointLights_1 {
+layout(binding = 1, std430) buffer PointLights_1 {
   PointLight values[];
 } pointLights;
 struct FragmentInput {

test/bug/tint/1113.wgsl.expected.glsl

@@ -34,19 +34,19 @@ layout(binding = 0) uniform Uniforms_1 {
   vec3 bbMax;
 } uniforms;
 
-layout(binding = 10) buffer U32s_1 {
+layout(binding = 10, std430) buffer U32s_1 {
   uint values[];
 } indices;
-layout(binding = 11) buffer F32s_1 {
+layout(binding = 11, std430) buffer F32s_1 {
   float values[];
 } positions;
-layout(binding = 20) buffer AU32s_1 {
+layout(binding = 20, std430) buffer AU32s_1 {
   uint values[];
 } counters;
-layout(binding = 21) buffer AI32s_1 {
+layout(binding = 21, std430) buffer AI32s_1 {
   int values[];
 } LUT;
-layout(binding = 50) buffer Dbg_1 {
+layout(binding = 50, std430) buffer Dbg_1 {
   uint offsetCounter;
   uint pad0;
   uint pad1;
@@ -156,19 +156,19 @@ layout(binding = 0) uniform Uniforms_1 {
   vec3 bbMax;
 } uniforms;
 
-layout(binding = 10) buffer U32s_1 {
+layout(binding = 10, std430) buffer U32s_1 {
   uint values[];
 } indices;
-layout(binding = 11) buffer F32s_1 {
+layout(binding = 11, std430) buffer F32s_1 {
   float values[];
 } positions;
-layout(binding = 20) buffer AU32s_1 {
+layout(binding = 20, std430) buffer AU32s_1 {
   uint values[];
 } counters;
-layout(binding = 21) buffer AI32s_1 {
+layout(binding = 21, std430) buffer AI32s_1 {
   int values[];
 } LUT;
-layout(binding = 50) buffer Dbg_1 {
+layout(binding = 50, std430) buffer Dbg_1 {
   uint offsetCounter;
   uint pad0;
   uint pad1;
@@ -247,19 +247,19 @@ layout(binding = 0) uniform Uniforms_1 {
   vec3 bbMax;
 } uniforms;
 
-layout(binding = 10) buffer U32s_1 {
+layout(binding = 10, std430) buffer U32s_1 {
   uint values[];
 } indices;
-layout(binding = 11) buffer F32s_1 {
+layout(binding = 11, std430) buffer F32s_1 {
   float values[];
 } positions;
-layout(binding = 20) buffer AU32s_1 {
+layout(binding = 20, std430) buffer AU32s_1 {
   uint values[];
 } counters;
-layout(binding = 21) buffer AI32s_1 {
+layout(binding = 21, std430) buffer AI32s_1 {
   int values[];
 } LUT;
-layout(binding = 50) buffer Dbg_1 {
+layout(binding = 50, std430) buffer Dbg_1 {
   uint offsetCounter;
   uint pad0;
   uint pad1;

test/bug/tint/1121.wgsl.expected.glsl

@@ -7,7 +7,7 @@ struct LightData {
   float radius;
 };
 
-layout(binding = 0) buffer LightsBuffer_1 {
+layout(binding = 0, std430) buffer LightsBuffer_1 {
   LightData lights[];
 } lightsBuffer;
 struct TileLightIdData {
@@ -19,7 +19,7 @@ struct Tiles {
   TileLightIdData data[4];
 };
 
-layout(binding = 0) buffer Tiles_1 {
+layout(binding = 0, std430) buffer Tiles_1 {
   TileLightIdData data[4];
 } tileLightId;
 struct Config {

test/bug/tint/1136.wgsl.expected.glsl

@@ -9,7 +9,7 @@ struct Buffer {
   uint data;
 };
 
-layout(binding = 0) buffer Buffer_1 {
+layout(binding = 0, std430) buffer Buffer_1 {
   uint data;
 } tint_symbol;
 void tint_symbol_1() {

test/bug/tint/1385.wgsl.expected.glsl

@@ -1,7 +1,7 @@
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer data_block_1 {
+layout(binding = 1, std430) buffer data_block_1 {
   int inner[];
 } data;
 int foo() {

test/bug/tint/221.wgsl.expected.glsl

@@ -6,7 +6,7 @@ struct Buf {
   uint data[50];
 };
 
-layout(binding = 0) buffer Buf_1 {
+layout(binding = 0, std430) buffer Buf_1 {
   uint count;
   uint data[50];
 } b;

test/bug/tint/294.wgsl.expected.glsl

@@ -10,6 +10,6 @@ struct Light {
   vec3 colour;
 };
 
-layout(binding = 1) buffer Lights_1 {
+layout(binding = 1, std430) buffer Lights_1 {
   Light light[];
 } lights;

test/bug/tint/369.wgsl.expected.glsl

@@ -9,7 +9,7 @@ struct S {
   mat2 m;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   mat2 m;
 } SSBO;
 layout(binding = 0) uniform S_2 {

test/bug/tint/492.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct S {
   int a;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a;
 } buf;
 void tint_symbol() {

test/bug/tint/534.wgsl.expected.glsl

@@ -8,7 +8,7 @@ struct Uniforms {
   uint channelCount;
 };
 
-layout(binding = 2) buffer OutputBuf_1 {
+layout(binding = 2, std430) buffer OutputBuf_1 {
   uint result[];
 } tint_symbol;
 layout(binding = 3) uniform Uniforms_1 {

test/bug/tint/744.wgsl.expected.glsl

@@ -7,13 +7,13 @@ struct Uniforms {
   uvec2 outShape;
 };
 
-layout(binding = 0) buffer Matrix_1 {
+layout(binding = 0, std430) buffer Matrix_1 {
   uint numbers[];
 } firstMatrix;
-layout(binding = 1) buffer Matrix_2 {
+layout(binding = 1, std430) buffer Matrix_2 {
   uint numbers[];
 } secondMatrix;
-layout(binding = 2) buffer Matrix_3 {
+layout(binding = 2, std430) buffer Matrix_3 {
   uint numbers[];
 } resultMatrix;
 layout(binding = 3) uniform Uniforms_1 {

test/bug/tint/757.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct Constants {
   int level;
 };
 
-layout(binding = 3) buffer Result_1 {
+layout(binding = 3, std430) buffer Result_1 {
   float values[];
 } result;
 uniform highp sampler2DArray myTexture_1;

test/bug/tint/827.wgsl.expected.glsl

@@ -2,7 +2,7 @@
 precision mediump float;
 
 const uint width = 128u;
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   float values[];
 } result;
 uniform highp sampler2D tex_1;

test/bug/tint/870.spvasm.expected.glsl

@@ -12,7 +12,7 @@ struct x_B4_BuildInformation {
   sspp962805860buildInformationS passthru;
 };
 
-layout(binding = 2) buffer x_B4_BuildInformation_1 {
+layout(binding = 2, std430) buffer x_B4_BuildInformation_1 {
   sspp962805860buildInformationS passthru;
 } sspp962805860buildInformation;
 void main_1() {

test/bug/tint/913.wgsl.expected.glsl

@@ -9,7 +9,7 @@ struct Uniforms {
   uvec2 copySize;
 };
 
-layout(binding = 2) buffer OutputBuf_1 {
+layout(binding = 2, std430) buffer OutputBuf_1 {
   uint result[];
 } tint_symbol;
 layout(binding = 3) uniform Uniforms_1 {

test/bug/tint/914.wgsl.expected.glsl

@@ -7,13 +7,13 @@ struct Uniforms {
   uint dimBOuter;
 };
 
-layout(binding = 0) buffer Matrix_1 {
+layout(binding = 0, std430) buffer Matrix_1 {
   float numbers[];
 } firstMatrix;
-layout(binding = 1) buffer Matrix_2 {
+layout(binding = 1, std430) buffer Matrix_2 {
   float numbers[];
 } secondMatrix;
-layout(binding = 2) buffer Matrix_3 {
+layout(binding = 2, std430) buffer Matrix_3 {
   float numbers[];
 } resultMatrix;
 layout(binding = 3) uniform Uniforms_1 {

test/bug/tint/926.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct DrawIndirectArgs {
   uint vertexCount;
 };
 
-layout(binding = 5) buffer DrawIndirectArgs_1 {
+layout(binding = 5, std430) buffer DrawIndirectArgs_1 {
   uint vertexCount;
 } drawOut;
 uint cubeVerts = 0u;

test/bug/tint/943.spvasm.expected.glsl

@@ -34,18 +34,18 @@ layout(binding = 3) uniform Uniforms_1 {
 
 int dimInner_1 = 0;
 int dimBOuter_1 = 0;
-layout(binding = 0) buffer ssbOut_1 {
+layout(binding = 0, std430) buffer ssbOut_1 {
   float result[];
 } x_54;
 uvec3 tint_symbol = uvec3(0u, 0u, 0u);
 uvec3 tint_symbol_1 = uvec3(0u, 0u, 0u);
 shared float mm_Asub[64][64];
 shared float mm_Bsub[64][1];
-layout(binding = 1) buffer ssbA_1 {
+layout(binding = 1, std430) buffer ssbA_1 {
   float A[];
 } x_165;
 int batch = 0;
-layout(binding = 2) buffer ssbB_1 {
+layout(binding = 2, std430) buffer ssbB_1 {
   float B[];
 } x_185;
 bool coordsInBounds_vi2_vi2_(inout ivec2 coord, inout ivec2 shape) {

test/bug/tint/951.spvasm.expected.glsl

@@ -19,10 +19,10 @@ struct Uniforms {
   int size;
 };
 
-layout(binding = 0) buffer ssbOut_1 {
+layout(binding = 0, std430) buffer ssbOut_1 {
   float result[];
 } x_16;
-layout(binding = 1) buffer ssbA_1 {
+layout(binding = 1, std430) buffer ssbA_1 {
   float A[];
 } x_20;
 uvec3 tint_symbol = uvec3(0u, 0u, 0u);

test/bug/tint/959.wgsl.expected.glsl

@@ -5,28 +5,28 @@ struct S {
   float a;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   float a;
 } b0;
-layout(binding = 0) buffer S_2 {
+layout(binding = 0, std430) buffer S_2 {
   float a;
 } b1;
-layout(binding = 0) buffer S_3 {
+layout(binding = 0, std430) buffer S_3 {
   float a;
 } b2;
-layout(binding = 0) buffer S_4 {
+layout(binding = 0, std430) buffer S_4 {
   float a;
 } b3;
-layout(binding = 0) buffer S_5 {
+layout(binding = 0, std430) buffer S_5 {
   float a;
 } b4;
-layout(binding = 0) buffer S_6 {
+layout(binding = 0, std430) buffer S_6 {
   float a;
 } b5;
-layout(binding = 0) buffer S_7 {
+layout(binding = 0, std430) buffer S_7 {
   float a;
 } b6;
-layout(binding = 0) buffer S_8 {
+layout(binding = 0, std430) buffer S_8 {
   float a;
 } b7;
 layout(binding = 1) uniform S_9 {

test/bug/tint/977.spvasm.expected.glsl

@@ -22,7 +22,7 @@ struct Uniforms {
 };
 
 uvec3 tint_symbol = uvec3(0u, 0u, 0u);
-layout(binding = 2) buffer ResultMatrix_1 {
+layout(binding = 2, std430) buffer ResultMatrix_1 {
   float numbers[];
 } resultMatrix;
 float binaryOperation_f1_f1_(inout float a, inout float b) {

test/bug/tint/980.wgsl.expected.glsl

@@ -12,7 +12,7 @@ struct S {
   uint i;
 };
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   vec3 v;
   uint i;
 } io;

test/bug/tint/993.wgsl.expected.glsl

@@ -13,14 +13,14 @@ struct Result {
   uint value;
 };
 
-layout(binding = 1) buffer Result_1 {
+layout(binding = 1, std430) buffer Result_1 {
   uint value;
 } result;
 struct TestData {
   int data[3];
 };
 
-layout(binding = 0) buffer TestData_1 {
+layout(binding = 0, std430) buffer TestData_1 {
   int data[3];
 } s;
 int runTest() {

test/builtins/arrayLength/complex_via_let.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer G_block_1 {
+layout(binding = 0, std430) buffer G_block_1 {
   int inner[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/deprecated.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/simple.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/simple_no_struct.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer G_block_1 {
+layout(binding = 0, std430) buffer G_block_1 {
   int inner[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/via_let.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/via_let_complex.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer S_1 {
+layout(binding = 0, std430) buffer S_1 {
   int a[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer G_block_1 {
+layout(binding = 0, std430) buffer G_block_1 {
   int inner[];
 } G;
 void tint_symbol() {

test/builtins/arrayLength/via_let_no_struct.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer G_block_1 {
+layout(binding = 0, std430) buffer G_block_1 {
   int inner[];
 } G;
 void tint_symbol() {

test/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   int arg_0[];
 } sb_ro;
 void arrayLength_1588cd() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   int arg_0[];
 } sb_ro;
 void arrayLength_1588cd() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   int arg_0[];
 } sb_ro;
 void arrayLength_1588cd() {

test/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0[];
 } sb_rw;
 void arrayLength_61b1c7() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0[];
 } sb_rw;
 void arrayLength_61b1c7() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0[];
 } sb_rw;
 void arrayLength_61b1c7() {

test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   float arg_0[];
 } sb_ro;
 void arrayLength_a0f5ca() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   float arg_0[];
 } sb_ro;
 void arrayLength_a0f5ca() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   float arg_0[];
 } sb_ro;
 void arrayLength_a0f5ca() {

test/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   float arg_0[];
 } sb_rw;
 void arrayLength_cdd123() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   float arg_0[];
 } sb_rw;
 void arrayLength_cdd123() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   float arg_0[];
 } sb_rw;
 void arrayLength_cdd123() {

test/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   uint arg_0[];
 } sb_ro;
 void arrayLength_cfca0a() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   uint arg_0[];
 } sb_ro;
 void arrayLength_cfca0a() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 1) buffer SB_RO_1 {
+layout(binding = 1, std430) buffer SB_RO_1 {
   uint arg_0[];
 } sb_ro;
 void arrayLength_cfca0a() {

test/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl

@@ -3,7 +3,7 @@ SKIP: FAILED
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0[];
 } sb_rw;
 void arrayLength_eb510f() {
@@ -35,7 +35,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0[];
 } sb_rw;
 void arrayLength_eb510f() {
@@ -63,7 +63,7 @@ ERROR: 2 compilation errors.  No code generated.
 #version 310 es
 precision mediump float;
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0[];
 } sb_rw;
 void arrayLength_eb510f() {

test/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicAdd_8a199a() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicAdd_8a199a() {

test/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicAdd_d32fe4() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicAdd_d32fe4() {

test/builtins/gen/atomicAnd/152966.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicAnd_152966() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicAnd_152966() {

test/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicAnd_85a8d9() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicAnd_85a8d9() {

test/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl

@@ -13,7 +13,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicCompareExchangeWeak_12871c() {
@@ -43,7 +43,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicCompareExchangeWeak_12871c() {

test/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl

@@ -13,7 +13,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicCompareExchangeWeak_6673da() {
@@ -43,7 +43,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicCompareExchangeWeak_6673da() {

test/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicExchange_d59712() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicExchange_d59712() {

test/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicExchange_f2e22f() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicExchange_f2e22f() {

test/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicLoad_0806ad() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicLoad_0806ad() {

test/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicLoad_fe6cc3() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicLoad_fe6cc3() {

test/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicMax_51b9be() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicMax_51b9be() {

test/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicMax_92aa72() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicMax_92aa72() {

test/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicMin_8e38dc() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicMin_8e38dc() {

test/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicMin_c67a74() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicMin_c67a74() {

test/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicOr_5e95d4() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicOr_5e95d4() {

test/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicOr_8d96a0() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicOr_8d96a0() {

test/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicStore_cdc29e() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicStore_cdc29e() {

test/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicStore_d1e9a6() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicStore_d1e9a6() {

test/builtins/gen/atomicSub/051100.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicSub_051100() {
@@ -27,7 +27,7 @@ struct SB_RW {
   int arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   int arg_0;
 } sb_rw;
 void atomicSub_051100() {

test/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl

@@ -5,7 +5,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicSub_15bfc9() {
@@ -27,7 +27,7 @@ struct SB_RW {
   uint arg_0;
 };
 
-layout(binding = 0) buffer SB_RW_1 {
+layout(binding = 0, std430) buffer SB_RW_1 {
   uint arg_0;
 } sb_rw;
 void atomicSub_15bfc9() {