From 46647f1c13338967c9b34c47a8c89cf68f25a009 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Fri, 4 Feb 2022 23:09:23 +0000 Subject: [PATCH] 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 Reviewed-by: David Neto Commit-Queue: Stephen White --- src/writer/glsl/generator_impl.cc | 2 +- .../glsl/generator_impl_function_test.cc | 12 +++---- .../generator_impl_member_accessor_test.cc | 22 ++++++------- .../glsl/generator_impl_sanitizer_test.cc | 6 ++-- .../assign_to_function_var.wgsl.expected.glsl | 2 +- .../assign_to_private_var.wgsl.expected.glsl | 2 +- .../assign_to_storage_var.wgsl.expected.glsl | 6 ++-- ...assign_to_workgroup_var.wgsl.expected.glsl | 2 +- test/array/strides.spvasm.expected.glsl | 2 +- test/benchmark/particles.wgsl.expected.glsl | 10 +++--- ...d-shadowed-pbr-fragment.wgsl.expected.glsl | 8 ++--- .../dynamic_index/read.wgsl.expected.glsl | 2 +- .../dynamic_index/write.wgsl.expected.glsl | 2 +- .../static_index/read.wgsl.expected.glsl | 2 +- .../static_index/write.wgsl.expected.glsl | 2 +- .../storage/types/array.wgsl.expected.glsl | 4 +-- .../storage/types/f32.wgsl.expected.glsl | 4 +-- .../storage/types/i32.wgsl.expected.glsl | 4 +-- .../storage/types/mat2x2.wgsl.expected.glsl | 4 +-- .../storage/types/mat2x3.wgsl.expected.glsl | 4 +-- .../storage/types/mat3x2.wgsl.expected.glsl | 4 +-- .../storage/types/mat4x4.wgsl.expected.glsl | 4 +-- .../types/runtime_array.wgsl.expected.glsl | 4 +-- .../storage/types/struct.wgsl.expected.glsl | 6 ++-- .../storage/types/u32.wgsl.expected.glsl | 4 +-- .../storage/types/vec2.wgsl.expected.glsl | 4 +-- .../storage/types/vec3.wgsl.expected.glsl | 4 +-- .../storage/types/vec4.wgsl.expected.glsl | 4 +-- test/bug/chromium/1273230.wgsl.expected.glsl | 10 +++--- test/bug/chromium/1290107.wgsl.expected.glsl | 2 +- .../read/function.wgsl.expected.glsl | 2 +- .../read/private.wgsl.expected.glsl | 2 +- .../read/storage.wgsl.expected.glsl | 4 +-- .../read/uniform.wgsl.expected.glsl | 2 +- .../read/workgroup.wgsl.expected.glsl | 2 +- .../write/function.wgsl.expected.glsl | 2 +- .../function_via_param.wgsl.expected.glsl | 2 +- .../write/private.wgsl.expected.glsl | 2 +- .../private_via_param.wgsl.expected.glsl | 2 +- .../write/storage.wgsl.expected.glsl | 4 +-- .../write/workgroup.wgsl.expected.glsl | 2 +- .../1206.wgsl.expected.glsl | 2 +- test/bug/tint/1046.wgsl.expected.glsl | 2 +- test/bug/tint/1113.wgsl.expected.glsl | 30 +++++++++--------- test/bug/tint/1121.wgsl.expected.glsl | 4 +-- test/bug/tint/1136.wgsl.expected.glsl | 2 +- test/bug/tint/1385.wgsl.expected.glsl | 2 +- test/bug/tint/221.wgsl.expected.glsl | 2 +- test/bug/tint/294.wgsl.expected.glsl | 2 +- test/bug/tint/369.wgsl.expected.glsl | 2 +- test/bug/tint/492.wgsl.expected.glsl | 2 +- test/bug/tint/534.wgsl.expected.glsl | 2 +- test/bug/tint/744.wgsl.expected.glsl | 6 ++-- test/bug/tint/757.wgsl.expected.glsl | 2 +- test/bug/tint/827.wgsl.expected.glsl | 2 +- test/bug/tint/870.spvasm.expected.glsl | 2 +- test/bug/tint/913.wgsl.expected.glsl | 2 +- test/bug/tint/914.wgsl.expected.glsl | 6 ++-- test/bug/tint/926.wgsl.expected.glsl | 2 +- test/bug/tint/943.spvasm.expected.glsl | 6 ++-- test/bug/tint/951.spvasm.expected.glsl | 4 +-- test/bug/tint/959.wgsl.expected.glsl | 16 +++++----- test/bug/tint/977.spvasm.expected.glsl | 2 +- test/bug/tint/980.wgsl.expected.glsl | 2 +- test/bug/tint/993.wgsl.expected.glsl | 4 +-- .../complex_via_let.wgsl.expected.glsl | 2 +- ...mplex_via_let_no_struct.wgsl.expected.glsl | 2 +- .../arrayLength/deprecated.wgsl.expected.glsl | 2 +- .../arrayLength/simple.wgsl.expected.glsl | 2 +- .../simple_no_struct.wgsl.expected.glsl | 2 +- .../arrayLength/via_let.wgsl.expected.glsl | 2 +- .../via_let_complex.wgsl.expected.glsl | 2 +- ...a_let_complex_no_struct.wgsl.expected.glsl | 2 +- .../via_let_no_struct.wgsl.expected.glsl | 2 +- .../gen/arrayLength/1588cd.wgsl.expected.glsl | 6 ++-- .../gen/arrayLength/61b1c7.wgsl.expected.glsl | 6 ++-- .../gen/arrayLength/a0f5ca.wgsl.expected.glsl | 6 ++-- .../gen/arrayLength/cdd123.wgsl.expected.glsl | 6 ++-- .../gen/arrayLength/cfca0a.wgsl.expected.glsl | 6 ++-- .../gen/arrayLength/eb510f.wgsl.expected.glsl | 6 ++-- .../gen/atomicAdd/8a199a.wgsl.expected.glsl | 4 +-- .../gen/atomicAdd/d32fe4.wgsl.expected.glsl | 4 +-- .../gen/atomicAnd/152966.wgsl.expected.glsl | 4 +-- .../gen/atomicAnd/85a8d9.wgsl.expected.glsl | 4 +-- .../12871c.wgsl.expected.glsl | 4 +-- .../6673da.wgsl.expected.glsl | 4 +-- .../atomicExchange/d59712.wgsl.expected.glsl | 4 +-- .../atomicExchange/f2e22f.wgsl.expected.glsl | 4 +-- .../gen/atomicLoad/0806ad.wgsl.expected.glsl | 4 +-- .../gen/atomicLoad/fe6cc3.wgsl.expected.glsl | 4 +-- .../gen/atomicMax/51b9be.wgsl.expected.glsl | 4 +-- .../gen/atomicMax/92aa72.wgsl.expected.glsl | 4 +-- .../gen/atomicMin/8e38dc.wgsl.expected.glsl | 4 +-- .../gen/atomicMin/c67a74.wgsl.expected.glsl | 4 +-- .../gen/atomicOr/5e95d4.wgsl.expected.glsl | 4 +-- .../gen/atomicOr/8d96a0.wgsl.expected.glsl | 4 +-- .../gen/atomicStore/cdc29e.wgsl.expected.glsl | 4 +-- .../gen/atomicStore/d1e9a6.wgsl.expected.glsl | 4 +-- .../gen/atomicSub/051100.wgsl.expected.glsl | 4 +-- .../gen/atomicSub/15bfc9.wgsl.expected.glsl | 4 +-- .../gen/atomicXor/54510e.wgsl.expected.glsl | 4 +-- .../gen/atomicXor/c1b78c.wgsl.expected.glsl | 4 +-- .../gen/isFinite/34d32b.wgsl.expected.glsl | 12 +++---- .../gen/isFinite/426f9f.wgsl.expected.glsl | 12 +++---- .../gen/isFinite/8a23ad.wgsl.expected.glsl | 12 +++---- .../gen/isFinite/f31987.wgsl.expected.glsl | 12 +++---- .../gen/isNormal/863dcd.wgsl.expected.glsl | 12 +++---- .../gen/isNormal/b00ab1.wgsl.expected.glsl | 12 +++---- .../gen/isNormal/c286b7.wgsl.expected.glsl | 12 +++---- .../gen/isNormal/c6e880.wgsl.expected.glsl | 12 +++---- test/builtins/repeated_use.wgsl.expected.glsl | 4 +-- .../write/packed_vec3/f32.wgsl.expected.glsl | 2 +- .../write/packed_vec3/i32.wgsl.expected.glsl | 2 +- .../write/packed_vec3/u32.wgsl.expected.glsl | 2 +- .../storage/mat2x2/f32.wgsl.expected.glsl | 2 +- .../mat2x2/stride/16.spvasm.expected.glsl | 2 +- .../load/local/ptr_storage.wgsl.expected.glsl | 2 +- test/samples/compute_boids.wgsl.expected.glsl | 4 +-- ...d_struct_storage_buffer.wgsl.expected.glsl | 4 +-- .../struct_dynamic_array.wgsl.expected.glsl | 2 +- ...amic_array_struct_array.wgsl.expected.glsl | 2 +- ...dr_of_non_constructable.wgsl.expected.glsl | 2 +- .../addr_of_runtime_array.wgsl.expected.glsl | 2 +- .../phony/storage_buffer.wgsl.expected.glsl | 2 +- ...ength_FromAccessChain.spvasm.expected.glsl | 2 +- ...t_ArrayLength_FromVar.spvasm.expected.glsl | 2 +- ...n_Struct_RuntimeArray.spvasm.expected.glsl | 2 +- ...hAccessChain_Cascaded.spvasm.expected.glsl | 2 +- ...cessChain_NonCascaded.spvasm.expected.glsl | 2 +- ...d_InBoundsAccessChain.spvasm.expected.glsl | 2 +- .../0-opt.spvasm.expected.glsl | 2 +- .../0-opt.wgsl.expected.glsl | 2 +- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.wgsl.expected.glsl | 2 +- .../0-opt.spvasm.expected.glsl | 6 ++-- .../cov-bitcount/0-opt.spvasm.expected.glsl | 12 +++---- .../0.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 18 +++++------ .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 18 +++++------ .../0-opt.spvasm.expected.glsl | 31 ++++++++++--------- .../0-opt.spvasm.expected.glsl | 12 +++---- .../0.spvasm.expected.glsl | 12 +++---- .../0-opt.spvasm.expected.glsl | 2 +- .../0-opt.wgsl.expected.glsl | 2 +- .../0-opt.spvasm.expected.glsl | 2 +- .../0-opt.wgsl.expected.glsl | 2 +- .../0-opt.spvasm.expected.glsl | 2 +- .../0-opt.wgsl.expected.glsl | 2 +- .../1.spvasm.expected.glsl | 4 +-- .../1.wgsl.expected.glsl | 4 +-- .../uint_sgreaterthan/0.spvasm.expected.glsl | 6 ++-- .../uint_sgreaterthan/0.wgsl.expected.glsl | 6 ++-- .../0.spvasm.expected.glsl | 6 ++-- .../0.wgsl.expected.glsl | 6 ++-- .../uint_slessthan/0.spvasm.expected.glsl | 6 ++-- .../uint_slessthan/0.wgsl.expected.glsl | 6 ++-- .../0.spvasm.expected.glsl | 6 ++-- .../uint_slessthanequal/0.wgsl.expected.glsl | 6 ++-- .../0-opt.spvasm.expected.glsl | 8 ++--- .../glsl_int_uclamp/0-opt.wgsl.expected.glsl | 8 ++--- .../glsl_uint_sabs/0-opt.spvasm.expected.glsl | 4 +-- .../glsl_uint_sabs/0-opt.wgsl.expected.glsl | 4 +-- .../0-opt.spvasm.expected.glsl | 8 ++--- .../glsl_uint_sclamp/0-opt.wgsl.expected.glsl | 8 ++--- .../glsl_uint_smax/0-opt.spvasm.expected.glsl | 6 ++-- .../glsl_uint_smax/0-opt.wgsl.expected.glsl | 6 ++-- .../glsl_uint_smin/0-opt.spvasm.expected.glsl | 6 ++-- .../glsl_uint_smin/0-opt.wgsl.expected.glsl | 6 ++-- .../uint_sdiv/0-opt.spvasm.expected.glsl | 6 ++-- .../uint_sdiv/0-opt.wgsl.expected.glsl | 6 ++-- .../uint_snegate/0-opt.spvasm.expected.glsl | 4 +-- .../uint_snegate/0-opt.wgsl.expected.glsl | 4 +-- .../no_ssbo_store/1.spvasm.expected.glsl | 2 +- .../no_ssbo_store/1.wgsl.expected.glsl | 2 +- .../1.spvasm.expected.glsl | 2 +- .../1.wgsl.expected.glsl | 2 +- 199 files changed, 539 insertions(+), 536 deletions(-) diff --git a/src/writer/glsl/generator_impl.cc b/src/writer/glsl/generator_impl.cc index 8857f8ad12..f0e51a1923 100644 --- a/src/writer/glsl/generator_impl.cc +++ b/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); diff --git a/src/writer/glsl/generator_impl_function_test.cc b/src/writer/glsl/generator_impl_function_test.cc index e186258228..ffcb607f70 100644 --- a/src/writer/glsl/generator_impl_function_test.cc +++ b/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() { diff --git a/src/writer/glsl/generator_impl_member_accessor_test.cc b/src/writer/glsl/generator_impl_member_accessor_test.cc index e93fb21b10..362e524488 100644 --- a/src/writer/glsl/generator_impl_member_accessor_test.cc +++ b/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() { diff --git a/src/writer/glsl/generator_impl_sanitizer_test.cc b/src/writer/glsl/generator_impl_sanitizer_test.cc index e5c781670d..2b663d1b89 100644 --- a/src/writer/glsl/generator_impl_sanitizer_test.cc +++ b/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() { diff --git a/test/array/assign_to_function_var.wgsl.expected.glsl b/test/array/assign_to_function_var.wgsl.expected.glsl index d127dcab54..3e5f1f2625 100644 --- a/test/array/assign_to_function_var.wgsl.expected.glsl +++ b/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() { diff --git a/test/array/assign_to_private_var.wgsl.expected.glsl b/test/array/assign_to_private_var.wgsl.expected.glsl index 992a8c6cc4..069c825310 100644 --- a/test/array/assign_to_private_var.wgsl.expected.glsl +++ b/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)); diff --git a/test/array/assign_to_storage_var.wgsl.expected.glsl b/test/array/assign_to_storage_var.wgsl.expected.glsl index 7df07b7511..9452e8686e 100644 --- a/test/array/assign_to_storage_var.wgsl.expected.glsl +++ b/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() { diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.glsl b/test/array/assign_to_workgroup_var.wgsl.expected.glsl index 14caa05006..50e26c93b0 100644 --- a/test/array/assign_to_workgroup_var.wgsl.expected.glsl +++ b/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]; diff --git a/test/array/strides.spvasm.expected.glsl b/test/array/strides.spvasm.expected.glsl index 21fc3e81a4..6e46ce7ffa 100644 --- a/test/array/strides.spvasm.expected.glsl +++ b/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() { diff --git a/test/benchmark/particles.wgsl.expected.glsl b/test/benchmark/particles.wgsl.expected.glsl index 89d1e67fbe..51b5e981f2 100644 --- a/test/benchmark/particles.wgsl.expected.glsl +++ b/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; diff --git a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl index 49d6d5cc12..af6c708918 100644 --- a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl +++ b/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; diff --git a/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl b/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl index 11436a6fb4..699ed59a75 100644 --- a/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl +++ b/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) { diff --git a/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl b/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl index 3e6a2025f9..a8792c92c9 100644 --- a/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl +++ b/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) { diff --git a/test/buffer/storage/static_index/read.wgsl.expected.glsl b/test/buffer/storage/static_index/read.wgsl.expected.glsl index 3e989aa0d1..c286530292 100644 --- a/test/buffer/storage/static_index/read.wgsl.expected.glsl +++ b/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; diff --git a/test/buffer/storage/static_index/write.wgsl.expected.glsl b/test/buffer/storage/static_index/write.wgsl.expected.glsl index 292daf0083..91947bf90a 100644 --- a/test/buffer/storage/static_index/write.wgsl.expected.glsl +++ b/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; diff --git a/test/buffer/storage/types/array.wgsl.expected.glsl b/test/buffer/storage/types/array.wgsl.expected.glsl index f93c0a45f4..f9af038822 100644 --- a/test/buffer/storage/types/array.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/f32.wgsl.expected.glsl b/test/buffer/storage/types/f32.wgsl.expected.glsl index ff15000489..1d15ab8247 100644 --- a/test/buffer/storage/types/f32.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/i32.wgsl.expected.glsl b/test/buffer/storage/types/i32.wgsl.expected.glsl index 2957e239ca..07206d4b93 100644 --- a/test/buffer/storage/types/i32.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/mat2x2.wgsl.expected.glsl b/test/buffer/storage/types/mat2x2.wgsl.expected.glsl index 39cb9fc5ad..00d1c383ce 100644 --- a/test/buffer/storage/types/mat2x2.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/mat2x3.wgsl.expected.glsl b/test/buffer/storage/types/mat2x3.wgsl.expected.glsl index 817129eb85..3b71731c06 100644 --- a/test/buffer/storage/types/mat2x3.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/mat3x2.wgsl.expected.glsl b/test/buffer/storage/types/mat3x2.wgsl.expected.glsl index 9d6db45803..591b0c7909 100644 --- a/test/buffer/storage/types/mat3x2.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/mat4x4.wgsl.expected.glsl b/test/buffer/storage/types/mat4x4.wgsl.expected.glsl index 4f401b0bd2..57e5f2d57b 100644 --- a/test/buffer/storage/types/mat4x4.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/runtime_array.wgsl.expected.glsl b/test/buffer/storage/types/runtime_array.wgsl.expected.glsl index 04989975d9..8e396dfe3e 100644 --- a/test/buffer/storage/types/runtime_array.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/struct.wgsl.expected.glsl b/test/buffer/storage/types/struct.wgsl.expected.glsl index 6c17bcab54..a08d79be83 100644 --- a/test/buffer/storage/types/struct.wgsl.expected.glsl +++ b/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. diff --git a/test/buffer/storage/types/u32.wgsl.expected.glsl b/test/buffer/storage/types/u32.wgsl.expected.glsl index c029902ffb..4586d69f32 100644 --- a/test/buffer/storage/types/u32.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/vec2.wgsl.expected.glsl b/test/buffer/storage/types/vec2.wgsl.expected.glsl index 430c76fe3d..b9b05a8c4d 100644 --- a/test/buffer/storage/types/vec2.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/vec3.wgsl.expected.glsl b/test/buffer/storage/types/vec3.wgsl.expected.glsl index 78851c655a..0a7d552e21 100644 --- a/test/buffer/storage/types/vec3.wgsl.expected.glsl +++ b/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() { diff --git a/test/buffer/storage/types/vec4.wgsl.expected.glsl b/test/buffer/storage/types/vec4.wgsl.expected.glsl index 8dc4c6edba..c6e6168834 100644 --- a/test/buffer/storage/types/vec4.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/chromium/1273230.wgsl.expected.glsl b/test/bug/chromium/1273230.wgsl.expected.glsl index bfc20ad387..2f8ed43c7b 100644 --- a/test/bug/chromium/1273230.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/chromium/1290107.wgsl.expected.glsl b/test/bug/chromium/1290107.wgsl.expected.glsl index a2b89e46c6..a68fe94ecb 100644 --- a/test/bug/chromium/1290107.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl index d40bfd57dc..f285c50224 100644 --- a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl index e2fef20adb..0ff8f674c9 100644 --- a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl +++ b/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)); diff --git a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl index 457175efc7..13a067e6f7 100644 --- a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl index 0b495f2d20..2ef95c3763 100644 --- a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl index 7e4929f4e9..30963db44d 100644 --- a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl index 100f67b053..4d79f329e5 100644 --- a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl index 997dd2e46b..90509aedd0 100644 --- a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl +++ b/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) { diff --git a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl index 0a776e7fe9..30ce5d2582 100644 --- a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl +++ b/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)); diff --git a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl index a4c0ad3611..ed3c5dc60b 100644 --- a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl +++ b/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)); diff --git a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl index aa44922afc..dffa9230f4 100644 --- a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl index 49e6366ee0..dc7ae93c98 100644 --- a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl b/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl index c2c8f93e1d..cd5b8298ea 100644 --- a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/1046.wgsl.expected.glsl b/test/bug/tint/1046.wgsl.expected.glsl index 68ab31222c..25caf1977f 100644 --- a/test/bug/tint/1046.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/1113.wgsl.expected.glsl b/test/bug/tint/1113.wgsl.expected.glsl index 89c5c46c23..1c55add5bd 100644 --- a/test/bug/tint/1113.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/tint/1121.wgsl.expected.glsl b/test/bug/tint/1121.wgsl.expected.glsl index 667cba62b8..1a96e80c1f 100644 --- a/test/bug/tint/1121.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/1136.wgsl.expected.glsl b/test/bug/tint/1136.wgsl.expected.glsl index 3af977094b..342a0c8146 100644 --- a/test/bug/tint/1136.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/tint/1385.wgsl.expected.glsl b/test/bug/tint/1385.wgsl.expected.glsl index 4031ab0b03..51423eeb97 100644 --- a/test/bug/tint/1385.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/tint/221.wgsl.expected.glsl b/test/bug/tint/221.wgsl.expected.glsl index b724d8f73f..2ea0d24eac 100644 --- a/test/bug/tint/221.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/tint/294.wgsl.expected.glsl b/test/bug/tint/294.wgsl.expected.glsl index 4a8775978b..88fba9c591 100644 --- a/test/bug/tint/294.wgsl.expected.glsl +++ 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; diff --git a/test/bug/tint/369.wgsl.expected.glsl b/test/bug/tint/369.wgsl.expected.glsl index f4e86cf626..4aa0146960 100644 --- a/test/bug/tint/369.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/492.wgsl.expected.glsl b/test/bug/tint/492.wgsl.expected.glsl index f4c36d61fb..b70240029b 100644 --- a/test/bug/tint/492.wgsl.expected.glsl +++ b/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() { diff --git a/test/bug/tint/534.wgsl.expected.glsl b/test/bug/tint/534.wgsl.expected.glsl index 8521fbdfc0..e7751d7295 100644 --- a/test/bug/tint/534.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/744.wgsl.expected.glsl b/test/bug/tint/744.wgsl.expected.glsl index cd60eb6a33..52221d1cf7 100644 --- a/test/bug/tint/744.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/757.wgsl.expected.glsl b/test/bug/tint/757.wgsl.expected.glsl index fab0f573fb..ea6d4be774 100644 --- a/test/bug/tint/757.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/tint/827.wgsl.expected.glsl b/test/bug/tint/827.wgsl.expected.glsl index 9933ba5b9d..e5308590b1 100644 --- a/test/bug/tint/827.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/tint/870.spvasm.expected.glsl b/test/bug/tint/870.spvasm.expected.glsl index 3f0ad908e4..ed30b13508 100644 --- a/test/bug/tint/870.spvasm.expected.glsl +++ b/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() { diff --git a/test/bug/tint/913.wgsl.expected.glsl b/test/bug/tint/913.wgsl.expected.glsl index 3d484afd89..0559e2d67b 100644 --- a/test/bug/tint/913.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/914.wgsl.expected.glsl b/test/bug/tint/914.wgsl.expected.glsl index e0de0678ac..75fc66350d 100644 --- a/test/bug/tint/914.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/926.wgsl.expected.glsl b/test/bug/tint/926.wgsl.expected.glsl index 15a518c5ca..4ed6ac387c 100644 --- a/test/bug/tint/926.wgsl.expected.glsl +++ b/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; diff --git a/test/bug/tint/943.spvasm.expected.glsl b/test/bug/tint/943.spvasm.expected.glsl index f88926bbfd..5ddf3e51ae 100644 --- a/test/bug/tint/943.spvasm.expected.glsl +++ b/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) { diff --git a/test/bug/tint/951.spvasm.expected.glsl b/test/bug/tint/951.spvasm.expected.glsl index 1d048c0c1d..a62e485661 100644 --- a/test/bug/tint/951.spvasm.expected.glsl +++ b/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); diff --git a/test/bug/tint/959.wgsl.expected.glsl b/test/bug/tint/959.wgsl.expected.glsl index 9ac597c3a9..7538459860 100644 --- a/test/bug/tint/959.wgsl.expected.glsl +++ b/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 { diff --git a/test/bug/tint/977.spvasm.expected.glsl b/test/bug/tint/977.spvasm.expected.glsl index 9c8e0ab03a..96d697f4e1 100644 --- a/test/bug/tint/977.spvasm.expected.glsl +++ b/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) { diff --git a/test/bug/tint/980.wgsl.expected.glsl b/test/bug/tint/980.wgsl.expected.glsl index 101917637e..6a1e700131 100644 --- a/test/bug/tint/980.wgsl.expected.glsl +++ 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; diff --git a/test/bug/tint/993.wgsl.expected.glsl b/test/bug/tint/993.wgsl.expected.glsl index 3e60c6ebef..b0b1868b17 100644 --- a/test/bug/tint/993.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/complex_via_let.wgsl.expected.glsl b/test/builtins/arrayLength/complex_via_let.wgsl.expected.glsl index f05ef5affa..6f43d16669 100644 --- a/test/builtins/arrayLength/complex_via_let.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl b/test/builtins/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl index fa8116800b..2df0269c54 100644 --- a/test/builtins/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/deprecated.wgsl.expected.glsl b/test/builtins/arrayLength/deprecated.wgsl.expected.glsl index 833412f140..d447f38e89 100644 --- a/test/builtins/arrayLength/deprecated.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/simple.wgsl.expected.glsl b/test/builtins/arrayLength/simple.wgsl.expected.glsl index f05ef5affa..6f43d16669 100644 --- a/test/builtins/arrayLength/simple.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/simple_no_struct.wgsl.expected.glsl b/test/builtins/arrayLength/simple_no_struct.wgsl.expected.glsl index fa8116800b..2df0269c54 100644 --- a/test/builtins/arrayLength/simple_no_struct.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/via_let.wgsl.expected.glsl b/test/builtins/arrayLength/via_let.wgsl.expected.glsl index f05ef5affa..6f43d16669 100644 --- a/test/builtins/arrayLength/via_let.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/via_let_complex.wgsl.expected.glsl b/test/builtins/arrayLength/via_let_complex.wgsl.expected.glsl index f05ef5affa..6f43d16669 100644 --- a/test/builtins/arrayLength/via_let_complex.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl b/test/builtins/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl index fa8116800b..2df0269c54 100644 --- a/test/builtins/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/arrayLength/via_let_no_struct.wgsl.expected.glsl b/test/builtins/arrayLength/via_let_no_struct.wgsl.expected.glsl index fa8116800b..2df0269c54 100644 --- a/test/builtins/arrayLength/via_let_no_struct.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl b/test/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl index e825ee32f2..af7a607f2c 100644 --- a/test/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl b/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl index 04d2a2d800..c8e824f017 100644 --- a/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl b/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl index 371149b7ac..730e08daff 100644 --- a/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl b/test/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl index 3b943830fb..3367d5b56a 100644 --- a/test/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl b/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl index a58d7138fc..55bfb57121 100644 --- a/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl b/test/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl index 758a7c47b9..e48d0cf920 100644 --- a/test/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl b/test/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl index 90a451a7ff..7cfbf78b3b 100644 --- a/test/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl b/test/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl index df84fccd32..1e1c7308ff 100644 --- a/test/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicAnd/152966.wgsl.expected.glsl b/test/builtins/gen/atomicAnd/152966.wgsl.expected.glsl index 18330ed759..9f34abb098 100644 --- a/test/builtins/gen/atomicAnd/152966.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl b/test/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl index 63cfda0e0a..fd1e8e9e09 100644 --- a/test/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl b/test/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl index 718abd16f8..fe25e03a39 100644 --- a/test/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl b/test/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl index 58433a27a6..c7fbeab083 100644 --- a/test/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl b/test/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl index 144ff7fb88..081d2a5f27 100644 --- a/test/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl b/test/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl index cad28eb703..270c30551d 100644 --- a/test/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl b/test/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl index a76e496339..0306ab2202 100644 --- a/test/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl b/test/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl index b7a75c02fc..07ac3ee991 100644 --- a/test/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl b/test/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl index 16d8fb416c..f726e3477c 100644 --- a/test/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl b/test/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl index 9811e873a5..1ffdba3c41 100644 --- a/test/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl b/test/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl index 43a6e16a51..d408681ba4 100644 --- a/test/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl b/test/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl index 42143c6c3a..4def8e7174 100644 --- a/test/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl b/test/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl index ecde95d195..01985c1df5 100644 --- a/test/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl b/test/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl index 049e08938d..38385920f2 100644 --- a/test/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl b/test/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl index d31459dccb..970c11be49 100644 --- a/test/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl b/test/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl index 7f0ccd6aa4..a5d2959db5 100644 --- a/test/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicSub/051100.wgsl.expected.glsl b/test/builtins/gen/atomicSub/051100.wgsl.expected.glsl index bf4dc0313d..62a7e3ad1b 100644 --- a/test/builtins/gen/atomicSub/051100.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl b/test/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl index 82d64e27f3..739d9c9f13 100644 --- a/test/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl +++ b/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() { diff --git a/test/builtins/gen/atomicXor/54510e.wgsl.expected.glsl b/test/builtins/gen/atomicXor/54510e.wgsl.expected.glsl index 6353458cbc..5427999701 100644 --- a/test/builtins/gen/atomicXor/54510e.wgsl.expected.glsl +++ b/test/builtins/gen/atomicXor/54510e.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 atomicXor_54510e() { @@ -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 atomicXor_54510e() { diff --git a/test/builtins/gen/atomicXor/c1b78c.wgsl.expected.glsl b/test/builtins/gen/atomicXor/c1b78c.wgsl.expected.glsl index f48a364db7..8e45daa7d7 100644 --- a/test/builtins/gen/atomicXor/c1b78c.wgsl.expected.glsl +++ b/test/builtins/gen/atomicXor/c1b78c.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 atomicXor_c1b78c() { @@ -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 atomicXor_c1b78c() { diff --git a/test/builtins/gen/isFinite/34d32b.wgsl.expected.glsl b/test/builtins/gen/isFinite/34d32b.wgsl.expected.glsl index 6de5cd4b73..28d6f701cf 100644 --- a/test/builtins/gen/isFinite/34d32b.wgsl.expected.glsl +++ b/test/builtins/gen/isFinite/34d32b.wgsl.expected.glsl @@ -24,9 +24,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -47,9 +47,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -71,9 +71,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/builtins/gen/isFinite/426f9f.wgsl.expected.glsl b/test/builtins/gen/isFinite/426f9f.wgsl.expected.glsl index 51d1125a8b..e097925c96 100644 --- a/test/builtins/gen/isFinite/426f9f.wgsl.expected.glsl +++ b/test/builtins/gen/isFinite/426f9f.wgsl.expected.glsl @@ -24,9 +24,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -47,9 +47,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -71,9 +71,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl b/test/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl index a4f158f001..2493776143 100644 --- a/test/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl +++ b/test/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl @@ -24,9 +24,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -47,9 +47,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -71,9 +71,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/builtins/gen/isFinite/f31987.wgsl.expected.glsl b/test/builtins/gen/isFinite/f31987.wgsl.expected.glsl index 3d49f8ed7f..445fb96e17 100644 --- a/test/builtins/gen/isFinite/f31987.wgsl.expected.glsl +++ b/test/builtins/gen/isFinite/f31987.wgsl.expected.glsl @@ -24,9 +24,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -47,9 +47,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -71,9 +71,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'isfinite' : no matching overloaded function found +ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/builtins/gen/isNormal/863dcd.wgsl.expected.glsl b/test/builtins/gen/isNormal/863dcd.wgsl.expected.glsl index c33bf3e10a..4d7f3fed9e 100644 --- a/test/builtins/gen/isNormal/863dcd.wgsl.expected.glsl +++ b/test/builtins/gen/isNormal/863dcd.wgsl.expected.glsl @@ -31,8 +31,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint4' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint4' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -60,8 +60,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint4' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint4' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -90,8 +90,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint4' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint4' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl b/test/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl index ed74f8e140..0084beca51 100644 --- a/test/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl +++ b/test/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl @@ -31,8 +31,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint2' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint2' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -60,8 +60,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint2' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint2' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -90,8 +90,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint2' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint2' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/builtins/gen/isNormal/c286b7.wgsl.expected.glsl b/test/builtins/gen/isNormal/c286b7.wgsl.expected.glsl index 79e52f62a8..cf69d333b0 100644 --- a/test/builtins/gen/isNormal/c286b7.wgsl.expected.glsl +++ b/test/builtins/gen/isNormal/c286b7.wgsl.expected.glsl @@ -31,8 +31,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint3' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint3' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -60,8 +60,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint3' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint3' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -90,8 +90,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint3' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint3' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/builtins/gen/isNormal/c6e880.wgsl.expected.glsl b/test/builtins/gen/isNormal/c6e880.wgsl.expected.glsl index ef28761f1a..5974f96844 100644 --- a/test/builtins/gen/isNormal/c6e880.wgsl.expected.glsl +++ b/test/builtins/gen/isNormal/c6e880.wgsl.expected.glsl @@ -31,9 +31,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'asuint' : no matching overloaded function found +ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -61,9 +61,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'asuint' : no matching overloaded function found +ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump uint' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. @@ -92,9 +92,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'asuint' : no matching overloaded function found +ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/builtins/repeated_use.wgsl.expected.glsl b/test/builtins/repeated_use.wgsl.expected.glsl index 450afef4f7..a27347a56d 100644 --- a/test/builtins/repeated_use.wgsl.expected.glsl +++ b/test/builtins/repeated_use.wgsl.expected.glsl @@ -97,8 +97,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:5: 'uint4' : undeclared identifier -ERROR: 0:5: '' : compilation terminated +ERROR: 0:5: 'uint4' : undeclared identifier +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl index b04cc88a20..f85921e0ee 100644 --- a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl @@ -9,7 +9,7 @@ struct S { vec3 v; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { vec3 v; } U; void f() { diff --git a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl index b50dd2e3e0..64d86eb4ce 100644 --- a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl @@ -9,7 +9,7 @@ struct S { ivec3 v; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { ivec3 v; } U; void f() { diff --git a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl index 6a8666cbc1..358bf4f53d 100644 --- a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl @@ -9,7 +9,7 @@ struct S { uvec3 v; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uvec3 v; } U; void f() { diff --git a/test/layout/storage/mat2x2/f32.wgsl.expected.glsl b/test/layout/storage/mat2x2/f32.wgsl.expected.glsl index 931fe1dac2..7c741c1aa2 100644 --- a/test/layout/storage/mat2x2/f32.wgsl.expected.glsl +++ b/test/layout/storage/mat2x2/f32.wgsl.expected.glsl @@ -5,7 +5,7 @@ struct SSBO { mat2 m; }; -layout(binding = 0) buffer SSBO_1 { +layout(binding = 0, std430) buffer SSBO_1 { mat2 m; } ssbo; void f() { diff --git a/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl b/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl index e82307f88e..d7244559a9 100644 --- a/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl +++ b/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl @@ -9,7 +9,7 @@ struct SSBO { strided_arr m[2]; }; -layout(binding = 0) buffer SSBO_1 { +layout(binding = 0, std430) buffer SSBO_1 { strided_arr m[2]; } ssbo; mat2 arr_to_mat2x2_stride_16(strided_arr arr[2]) { diff --git a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl index eda6fc637e..c8dfc57e4b 100644 --- a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_storage.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; } v; void tint_symbol() { diff --git a/test/samples/compute_boids.wgsl.expected.glsl b/test/samples/compute_boids.wgsl.expected.glsl index d44de14f4d..44aa80ccab 100644 --- a/test/samples/compute_boids.wgsl.expected.glsl +++ b/test/samples/compute_boids.wgsl.expected.glsl @@ -100,10 +100,10 @@ layout(binding = 0) uniform SimParams_1 { float rule3Scale; } params; -layout(binding = 1) buffer Particles_1 { +layout(binding = 1, std430) buffer Particles_1 { Particle particles[5]; } particlesA; -layout(binding = 2) buffer Particles_2 { +layout(binding = 2, std430) buffer Particles_2 { Particle particles[5]; } particlesB; void comp_main(uvec3 tint_symbol) { diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl index 69b31556bd..321e23127f 100644 --- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl +++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl @@ -11,7 +11,7 @@ struct S { vec4 v; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { float f; uint u; vec4 v; @@ -29,7 +29,7 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:21: 'assign' : cannot convert from ' in structure{ global mediump float f, global mediump uint u, global mediump 4-component vector of float v}' to 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer mediump float f, layout( column_major shared) buffer mediump uint u, layout( column_major shared) buffer mediump 4-component vector of float v}' +ERROR: 0:21: 'assign' : cannot convert from ' in structure{ global mediump float f, global mediump uint u, global mediump 4-component vector of float v}' to 'layout( binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer mediump float f, layout( column_major std430 offset=4) buffer mediump uint u, layout( column_major std430 offset=16) buffer mediump 4-component vector of float v}' ERROR: 0:21: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl index cf0aef0301..ae445aca1e 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl @@ -13,7 +13,7 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(binding = 0) buffer OuterS_1 { +layout(binding = 0, std430) buffer OuterS_1 { InnerS a1[]; } s1; void tint_symbol() { diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl index 28a11c1d71..9ac6327d7f 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl @@ -19,7 +19,7 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(binding = 0) buffer OuterS_1 { +layout(binding = 0, std430) buffer OuterS_1 { S1 a1[]; } s; void tint_symbol() { diff --git a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl index 09eb4864dc..8a72b47ce2 100644 --- a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl +++ b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl @@ -1,7 +1,7 @@ #version 310 es precision mediump float; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int arr[]; } s; void tint_symbol() { diff --git a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl index 09eb4864dc..8a72b47ce2 100644 --- a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl +++ b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl @@ -1,7 +1,7 @@ #version 310 es precision mediump float; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int arr[]; } s; void tint_symbol() { diff --git a/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl b/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl index 44d8fcc9d8..e1a9e20cf4 100644 --- a/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl +++ b/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl @@ -5,7 +5,7 @@ struct S { int i; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int i; } s; void tint_symbol() { diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl index 6e4715f2f0..2e8e85b046 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { uint rtarr[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint first; uint rtarr[]; } myvar; diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl index 6e4715f2f0..2e8e85b046 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { uint rtarr[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint first; uint rtarr[]; } myvar; diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl index 2447bc00df..278174435c 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { float age[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { float field0; float age[]; } myvar; diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl index f100aa6e10..f7775411e8 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { uint field1[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; } myvar; diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl index 6b48d1925e..dfa261f3d4 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { uint field1[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; } myvar; diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl index 6b48d1925e..dfa261f3d4 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl @@ -8,7 +8,7 @@ struct S { uint field1[]; }; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; } myvar; diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl index 1c13254412..bc6900e2b1 100644 --- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl @@ -13,7 +13,7 @@ struct buf1 { }; uvec3 tint_symbol = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { int global_seed; int data[]; } x_7; diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl index acddae32ba..a7ca19e76a 100644 --- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl @@ -17,7 +17,7 @@ struct buf1 { }; uvec3 tint_symbol = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { int global_seed; int data[]; } x_7; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl index 7d514df328..7ccedbdd9d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl @@ -5,25 +5,25 @@ warning: use of deprecated builtin precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { float el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_float_values[1]; + strided_arr_1 x_GLF_uniform_float_values[1]; }; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; } x_8; void main_1() { @@ -92,7 +92,7 @@ void main() { } Error parsing GLSL shader: ERROR: 0:43: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:43: '' : compilation terminated +ERROR: 0:43: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl index 604dfed5fc..4d69683543 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl @@ -118,7 +118,7 @@ void main() { } Error parsing GLSL shader: ERROR: 0:32: '%' : 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:32: '' : compilation terminated +ERROR: 0:32: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl index 4c65bdc782..ce822d7ec0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl @@ -11,16 +11,16 @@ vec4 tint_unpack4x8unorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl index fe32bd4506..944bf9ec33 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl @@ -4,29 +4,29 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; }; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; } x_8; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; } x_11; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl index 93a8edf16f..5a6fcec2b2 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; } x_5; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl index deecf4ff4d..3765e73e1b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl @@ -11,42 +11,42 @@ vec4 tint_unpack4x8snorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[3]; + strided_arr x_GLF_uniform_float_values[3]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf2 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; struct buf3 { int three; }; -struct tint_padded_array_element_2 { +struct strided_arr_2 { uint el; }; struct buf0 { - tint_padded_array_element_2 x_GLF_uniform_uint_values[1]; + strided_arr_2 x_GLF_uniform_uint_values[1]; }; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[3]; + strided_arr x_GLF_uniform_float_values[3]; } x_8; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 2) uniform buf2_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_12; layout(binding = 3) uniform buf3_1 { @@ -54,7 +54,7 @@ layout(binding = 3) uniform buf3_1 { } x_14; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_2 x_GLF_uniform_uint_values[1]; + strided_arr_2 x_GLF_uniform_uint_values[1]; } x_16; void func0_() { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl index 0662c7637a..6cedb1fd8e 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl index abe7c04813..87d316c98d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl @@ -4,20 +4,20 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; }; struct buf2 { @@ -26,11 +26,11 @@ struct buf2 { int x_GLF_global_loop_count = 0; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_7; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; } x_10; layout(binding = 2) uniform buf2_1 { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl index b3a2077e26..465bf71768 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl @@ -4,30 +4,30 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; }; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; } x_8; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; } x_10; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl index 0ee42ce3d9..b850705cf2 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl index 9dcb6b466b..e9dcfbeae0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl @@ -4,17 +4,17 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; }; int x_GLF_global_loop_count = 0; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; } x_7; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl index fba22664f8..3fbdde5874 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[5]; + strided_arr x_GLF_uniform_int_values[5]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[5]; + strided_arr x_GLF_uniform_int_values[5]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl index 077ea9bfdc..5328e561ee 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl @@ -16,28 +16,28 @@ vec4 tint_unpack4x8snorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_6; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl index 0942b777c0..7b659853b0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl @@ -4,30 +4,30 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { float el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_float_values[2]; + strided_arr_1 x_GLF_uniform_float_values[2]; }; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; } x_8; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_float_values[2]; + strided_arr_1 x_GLF_uniform_float_values[2]; } x_10; float f1_f1_(inout float a) { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl index 614a628fc7..26f997764b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl @@ -16,28 +16,28 @@ vec4 tint_unpack4x8snorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[7]; + strided_arr x_GLF_uniform_float_values[7]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[7]; + strided_arr x_GLF_uniform_float_values[7]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl index 831d9b6d92..4d706b54a5 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl @@ -4,28 +4,28 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { float el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_float_values[2]; + strided_arr_1 x_GLF_uniform_float_values[2]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_int_values[3]; + strided_arr x_GLF_uniform_int_values[3]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_float_values[2]; + strided_arr_1 x_GLF_uniform_float_values[2]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl index 0f1b8ba963..06e12be1ae 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl @@ -16,28 +16,28 @@ vec4 tint_unpack4x8snorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { float el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_float_values[3]; + strided_arr_1 x_GLF_uniform_float_values[3]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; } x_8; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_float_values[3]; + strided_arr_1 x_GLF_uniform_float_values[3]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl index bded5843c9..51ebfc58f4 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl @@ -16,28 +16,28 @@ vec4 tint_unpack4x8unorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[4]; + strided_arr x_GLF_uniform_float_values[4]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[4]; + strided_arr x_GLF_uniform_float_values[4]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl index b6862f684f..962d39483a 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_5; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl index 116a3a2f93..cea0071a0c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[6]; + strided_arr x_GLF_uniform_int_values[6]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[6]; + strided_arr x_GLF_uniform_int_values[6]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl index 8c65410ee6..b0e150c6ce 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl @@ -4,28 +4,28 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_6; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; } x_11; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl index d07d066520..97f36d5ec0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl @@ -4,28 +4,28 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_7; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_10; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl index 284ba47599..8c470ea09a 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[2]; + strided_arr x_GLF_uniform_int_values[2]; } x_6; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl index 793f1f9b2d..79efa57aa3 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl @@ -14,12 +14,12 @@ struct buf1 { uint one; }; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[1]; + strided_arr x_GLF_uniform_int_values[1]; }; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); @@ -29,7 +29,7 @@ layout(binding = 1) uniform buf1_1 { vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[1]; + strided_arr x_GLF_uniform_int_values[1]; } x_10; float func_() { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl index cd6a9d6c8c..70954087ea 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl @@ -8,20 +8,20 @@ struct buf2 { float one; }; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; mat4x2 m = mat4x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); @@ -30,12 +30,12 @@ layout(binding = 2) uniform buf2_1 { } x_10; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[1]; + strided_arr x_GLF_uniform_float_values[1]; } x_12; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_16; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl index 5c52cb4a2c..7c17275f60 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl @@ -16,28 +16,28 @@ vec4 tint_unpack4x8unorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[4]; + strided_arr x_GLF_uniform_float_values[4]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[4]; + strided_arr x_GLF_uniform_float_values[4]; } x_8; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl index 99d13200f7..e436d2babe 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl @@ -4,17 +4,17 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_8; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl index 393473c808..c7dea64959 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl @@ -4,16 +4,16 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; } x_5; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl index d425050677..48bf4dca37 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl @@ -4,30 +4,30 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; }; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_7; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; } x_9; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl index 8c0d1345b8..440f95f174 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl @@ -11,40 +11,40 @@ vec4 tint_unpack4x8unorm(uint param_0) { layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { uint el; }; struct buf0 { - tint_padded_array_element x_GLF_uniform_uint_values[1]; + strided_arr x_GLF_uniform_uint_values[1]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; }; -struct tint_padded_array_element_2 { +struct strided_arr_2 { float el; }; struct buf2 { - tint_padded_array_element_2 x_GLF_uniform_float_values[3]; + strided_arr_2 x_GLF_uniform_float_values[3]; }; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element x_GLF_uniform_uint_values[1]; + strided_arr x_GLF_uniform_uint_values[1]; } x_6; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[2]; + strided_arr_1 x_GLF_uniform_int_values[2]; } x_8; layout(binding = 2) uniform buf2_1 { - tint_padded_array_element_2 x_GLF_uniform_float_values[3]; + strided_arr_2 x_GLF_uniform_float_values[3]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl index d060ee954c..005362d121 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl @@ -4,34 +4,34 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[3]; + strided_arr x_GLF_uniform_float_values[3]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[3]; + strided_arr x_GLF_uniform_float_values[3]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[4]; + strided_arr_1 x_GLF_uniform_int_values[4]; } x_8; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { mat4x3 m43 = mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - tint_padded_array_element sums[3] = tint_padded_array_element[3](tint_padded_array_element(0.0f), tint_padded_array_element(0.0f), tint_padded_array_element(0.0f)); + strided_arr sums[3] = strided_arr[3](strided_arr(0.0f), strided_arr(0.0f), strided_arr(0.0f)); int i = 0; int a = 0; int x_67_phi = 0; @@ -45,8 +45,11 @@ void main_1() { float x_58 = x_6.x_GLF_uniform_float_values[0].el; float x_60 = x_6.x_GLF_uniform_float_values[0].el; float x_62 = x_6.x_GLF_uniform_float_values[0].el; - tint_padded_array_element tint_symbol_1[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); - sums = tint_symbol_1; + strided_arr tint_symbol_1 = strided_arr(x_58); + strided_arr tint_symbol_2 = strided_arr(x_60); + strided_arr tint_symbol_3 = strided_arr(x_62); + strided_arr tint_symbol_4[3] = strided_arr[3](tint_symbol_1, tint_symbol_2, tint_symbol_3); + sums = tint_symbol_4; int x_65 = x_8.x_GLF_uniform_int_values[0].el; i = x_65; x_67_phi = x_65; @@ -102,8 +105,8 @@ struct main_out { main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_5 = main_out(x_GLF_color); + return tint_symbol_5; } void main() { @@ -112,9 +115,9 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:74: '[' : matrix index out of range '4' -ERROR: 0:74: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' -ERROR: 0:74: '' : compilation terminated +ERROR: 0:77: '[' : matrix index out of range '4' +ERROR: 0:77: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' +ERROR: 0:77: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl index f3909fade5..bb41dfa6e0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl @@ -4,28 +4,28 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { int el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { float el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_float_values[1]; + strided_arr_1 x_GLF_uniform_float_values[1]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_int_values[4]; + strided_arr x_GLF_uniform_int_values[4]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_float_values[1]; + strided_arr_1 x_GLF_uniform_float_values[1]; } x_10; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl index a78e4c18c4..eda3b9ae04 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl @@ -4,28 +4,28 @@ SKIP: FAILED precision mediump float; layout(location = 0) out vec4 x_GLF_color_1_1; -struct tint_padded_array_element { +struct strided_arr { float el; }; struct buf1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; }; -struct tint_padded_array_element_1 { +struct strided_arr_1 { int el; }; struct buf0 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; }; layout(binding = 1) uniform buf1_1 { - tint_padded_array_element x_GLF_uniform_float_values[2]; + strided_arr x_GLF_uniform_float_values[2]; } x_6; layout(binding = 0) uniform buf0_1 { - tint_padded_array_element_1 x_GLF_uniform_int_values[3]; + strided_arr_1 x_GLF_uniform_int_values[3]; } x_8; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl index 5c9dc75026..2c0ca1cc56 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl @@ -16,7 +16,7 @@ layout(binding = 1) uniform buf0_1 { vec2 injectionSwitch; } x_9; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { uint x_compute_data[]; } x_12; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl index ca234df5f1..e81d36cfd0 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl @@ -20,7 +20,7 @@ layout(binding = 1) uniform buf0_1 { vec2 injectionSwitch; } x_9; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { uint x_compute_data[]; } x_12; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl index db14a3588c..97fd719da4 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl @@ -7,7 +7,7 @@ struct doesNotMatter { float x_compute_data[]; }; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { float x_compute_data[]; } x_9; float nb_mod_() { diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl index e78effd5d0..ae1bdf6ec8 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl @@ -11,7 +11,7 @@ struct doesNotMatter { float x_compute_data[]; }; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { float x_compute_data[]; } x_9; float nb_mod_() { diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl index b9afdabaa8..0e215f4da0 100644 --- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl @@ -24,7 +24,7 @@ layout(binding = 2) uniform buf2_1 { vec2 resolution; } x_13; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { int x_compute_data[]; } x_15; void main_1() { diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl index f741d595d9..397b67ada5 100644 --- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl @@ -28,7 +28,7 @@ layout(binding = 2) uniform buf2_1 { vec2 resolution; } x_13; -layout(binding = 0) buffer doesNotMatter_1 { +layout(binding = 0, std430) buffer doesNotMatter_1 { int x_compute_data[]; } x_15; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl index e2366a2846..e32bbf2bb4 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl @@ -11,10 +11,10 @@ struct Buf0 { uint values[]; }; -layout(binding = 1) buffer Buf1_1 { +layout(binding = 1, std430) buffer Buf1_1 { int result; } x_4; -layout(binding = 0) buffer Buf0_1 { +layout(binding = 0, std430) buffer Buf0_1 { uint values[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl index a213db562c..73d39e20f4 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl @@ -15,10 +15,10 @@ struct Buf0 { uint values[]; }; -layout(binding = 1) buffer Buf1_1 { +layout(binding = 1, std430) buffer Buf1_1 { int result; } x_4; -layout(binding = 0) buffer Buf0_1 { +layout(binding = 0, std430) buffer Buf0_1 { uint values[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl index d9d2c64549..1f8e36b59f 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl index 68344d44f0..40fbe8b960 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl index 9fde01f0c5..4bb64eb52b 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl index 926a4ebb87..e1eeb63bdf 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl index 13404d0cea..5473086ac3 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl index 84ad124560..6745e2960c 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl index 18b1f2afbe..f660afad9a 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl index 5874bf243c..2bd3fa2b4b 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl index 251a504274..475cb6712d 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl @@ -8,16 +8,16 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { int field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { int field0[]; } x_8; -layout(binding = 3) buffer S_4 { +layout(binding = 3, std430) buffer S_4 { int field0[]; } x_9; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl index a47b09b5f5..74eb7fcab3 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl @@ -12,16 +12,16 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { int field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { int field0[]; } x_8; -layout(binding = 3) buffer S_4 { +layout(binding = 3, std430) buffer S_4 { int field0[]; } x_9; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl index c98c63f1f6..860700b828 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl @@ -8,10 +8,10 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl index e0845f79ea..78937e9b6a 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl @@ -12,10 +12,10 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl index cd581c80a5..4b2608e768 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl @@ -8,16 +8,16 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; -layout(binding = 3) buffer S_4 { +layout(binding = 3, std430) buffer S_4 { uint field0[]; } x_9; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl index e156568a5e..487d31927b 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl @@ -12,16 +12,16 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; -layout(binding = 3) buffer S_4 { +layout(binding = 3, std430) buffer S_4 { uint field0[]; } x_9; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl index 52e29ede6e..31a020aefd 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl index 16cdc9c7b5..42fdf93dbc 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl index 57bf5a7304..73fef33b99 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl index 40efa370eb..4d329dcec5 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_3 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_6; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_7; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_8; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl index da8852d554..35a67d646c 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl @@ -8,13 +8,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl index ad5194bb04..e6231396bc 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl @@ -12,13 +12,13 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; -layout(binding = 2) buffer S_3 { +layout(binding = 2, std430) buffer S_3 { uint field0[]; } x_7; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl index 6b2368eb34..a7c893f669 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl @@ -8,10 +8,10 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl index 6cb02de7d4..bec61b4abc 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl @@ -12,10 +12,10 @@ struct S { }; uvec3 x_2 = uvec3(0u, 0u, 0u); -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { uint field0[]; } x_5; -layout(binding = 1) buffer S_2 { +layout(binding = 1, std430) buffer S_2 { uint field0[]; } x_6; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl index 14953d8033..054a5ccad4 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl @@ -12,7 +12,7 @@ struct S { vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_5; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl index b523e0d82f..5fbe8991b8 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl @@ -16,7 +16,7 @@ struct S { vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_5; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl index 46fb7d66f2..d1e6534db7 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl @@ -12,7 +12,7 @@ struct S { vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_5; void main_1() { diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl index e357ce52a8..4bd98da1fc 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl @@ -16,7 +16,7 @@ struct S { vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -layout(binding = 0) buffer S_1 { +layout(binding = 0, std430) buffer S_1 { int field0[]; } x_5; void main_1() {