GLSL: Change Add[Spirv]BlockAttribute to support GLSL

Modify the AddSpirvBlockAttribute transform to fix top-level structure
access of uniform, storage and push-constant buffers for use in the
GLSL backend. The small change to the transform makes the transform
wrap host-sharable buffers, if they're also used as a
non-host-sharable structure. Also rename the transform to
AddBlockAttrbibute in order to reflect its wider applicability.

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

test/tint/statements/compound_assign/for_loop.wgsl.expected.glsl

@@ -4,17 +4,12 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-  vec4 b;
-  mat2 c;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
   vec4 b;
   mat2 c;
 } v;
+
 uint i = 0u;
 int idx1() {
   i = (i + 1u);

test/tint/statements/compound_assign/matrix/minus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  mat4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   mat4 a;
 } v;
+
 void foo() {
   v.a = (v.a - mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }

test/tint/statements/compound_assign/matrix/plus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  mat4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   mat4 a;
 } v;
+
 void foo() {
   v.a = (v.a + mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }

test/tint/statements/compound_assign/matrix/times-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  mat4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   mat4 a;
 } v;
+
 void foo() {
   v.a = (v.a * 2.0f);
 }

test/tint/statements/compound_assign/matrix/times.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  mat4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   mat4 a;
 } v;
+
 void foo() {
   v.a = (v.a * mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }

test/tint/statements/compound_assign/scalar/and.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a & 2);
 }

test/tint/statements/compound_assign/scalar/divide.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a / 2);
 }

test/tint/statements/compound_assign/scalar/minus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a - 2);
 }

test/tint/statements/compound_assign/scalar/modulo.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a % 2);
 }

test/tint/statements/compound_assign/scalar/or.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a | 2);
 }

test/tint/statements/compound_assign/scalar/plus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a + 2);
 }

test/tint/statements/compound_assign/scalar/shift_left.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a << 2u);
 }

test/tint/statements/compound_assign/scalar/shift_right.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a >> 2u);
 }

test/tint/statements/compound_assign/scalar/times.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a * 2);
 }

test/tint/statements/compound_assign/scalar/xor.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  int a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   int a;
 } v;
+
 void foo() {
   v.a = (v.a ^ 2);
 }

test/tint/statements/compound_assign/vector/and.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a & ivec4(2));
 }

test/tint/statements/compound_assign/vector/divide-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  vec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   vec4 a;
 } v;
+
 void foo() {
   v.a = (v.a / 2.0f);
 }

test/tint/statements/compound_assign/vector/divide.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a / ivec4(2));
 }

test/tint/statements/compound_assign/vector/minus-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  vec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   vec4 a;
 } v;
+
 void foo() {
   v.a = (v.a - 2.0f);
 }

test/tint/statements/compound_assign/vector/minus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a - ivec4(2));
 }

test/tint/statements/compound_assign/vector/modulo-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a % 2);
 }

test/tint/statements/compound_assign/vector/modulo.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a % ivec4(2));
 }

test/tint/statements/compound_assign/vector/or.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a | ivec4(2));
 }

test/tint/statements/compound_assign/vector/plus-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  vec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   vec4 a;
 } v;
+
 void foo() {
   v.a = (v.a + 2.0f);
 }

test/tint/statements/compound_assign/vector/plus.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a + ivec4(2));
 }

test/tint/statements/compound_assign/vector/shift_left.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a << uvec4(2u));
 }

test/tint/statements/compound_assign/vector/shift_right.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a >> uvec4(2u));
 }

test/tint/statements/compound_assign/vector/times-matrix.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  vec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   vec4 a;
 } v;
+
 void foo() {
   v.a = (v.a * mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f)));
 }

test/tint/statements/compound_assign/vector/times-scalar.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  vec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   vec4 a;
 } v;
+
 void foo() {
   v.a = (v.a * 2.0f);
 }

test/tint/statements/compound_assign/vector/times.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a * ivec4(2));
 }

test/tint/statements/compound_assign/vector/xor.wgsl.expected.glsl

@@ -4,13 +4,10 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-struct S {
-  ivec4 a;
-};
-
-layout(binding = 0, std430) buffer S_1 {
+layout(binding = 0, std430) buffer S_ssbo {
   ivec4 a;
 } v;
+
 void foo() {
   v.a = (v.a ^ ivec4(2));
 }