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/buffer/uniform/dynamic_index/read.wgsl.expected.glsl

@@ -34,11 +34,7 @@ struct S {
   Inner arr[8];
 };
 
-struct S_std140 {
-  Inner_std140 arr[8];
-};
-
-layout(binding = 0) uniform S_std140_1 {
+layout(binding = 0) uniform S_std140_ubo {
   Inner_std140 arr[8];
 } s;
 

test/tint/buffer/uniform/static_index/read.wgsl.expected.glsl

@@ -19,24 +19,7 @@ struct S {
   Inner l[4];
 };
 
-struct S_std140 {
-  ivec3 a;
-  int b;
-  uvec3 c;
-  uint d;
-  vec3 e;
-  float f;
-  ivec2 g;
-  ivec2 h;
-  mat2x3 i;
-  vec2 j_0;
-  vec2 j_1;
-  vec2 j_2;
-  Inner k;
-  Inner l[4];
-};
-
-layout(binding = 0) uniform S_std140_1 {
+layout(binding = 0) uniform S_std140_ubo {
   ivec3 a;
   int b;
   uvec3 c;

test/tint/buffer/uniform/std140/mat2x2/dynamic_index_via_ptr.wgsl.expected.glsl

@@ -17,11 +17,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat2x2/static_index_via_ptr.wgsl.expected.glsl

@@ -17,11 +17,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat2x2/to_builtin.wgsl.expected.glsl

@@ -13,11 +13,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat2x2/to_fn.wgsl.expected.glsl

@@ -13,11 +13,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat2x2/to_private.wgsl.expected.glsl

@@ -13,11 +13,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat2x2/to_storage.wgsl.expected.glsl

@@ -13,21 +13,14 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 
-struct s_block {
-  S inner[4];
-};
-
-layout(binding = 1, std430) buffer s_block_1 {
+layout(binding = 1, std430) buffer s_block_ssbo {
   S inner[4];
 } s;
+
 S conv_S(S_std140 val) {
   S tint_symbol = S(val.before, mat2(val.m_0, val.m_1), val.after);
   return tint_symbol;

test/tint/buffer/uniform/std140/mat2x2/to_workgroup.wgsl.expected.glsl

@@ -13,11 +13,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat3x2/dynamic_index_via_ptr.wgsl.expected.glsl

@@ -18,11 +18,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat3x2/static_index_via_ptr.wgsl.expected.glsl

@@ -18,11 +18,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat3x2/to_builtin.wgsl.expected.glsl

@@ -14,11 +14,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat3x2/to_fn.wgsl.expected.glsl

@@ -14,11 +14,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat3x2/to_private.wgsl.expected.glsl

@@ -14,11 +14,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat3x2/to_storage.wgsl.expected.glsl

@@ -14,21 +14,14 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 
-struct s_block {
-  S inner[4];
-};
-
-layout(binding = 1, std430) buffer s_block_1 {
+layout(binding = 1, std430) buffer s_block_ssbo {
   S inner[4];
 } s;
+
 S conv_S(S_std140 val) {
   S tint_symbol = S(val.before, mat3x2(val.m_0, val.m_1, val.m_2), val.after);
   return tint_symbol;

test/tint/buffer/uniform/std140/mat3x2/to_workgroup.wgsl.expected.glsl

@@ -14,11 +14,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat4x2/dynamic_index_via_ptr.wgsl.expected.glsl

@@ -19,11 +19,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat4x2/static_index_via_ptr.wgsl.expected.glsl

@@ -19,11 +19,7 @@ struct Outer_std140 {
   Inner_std140 a[4];
 };
 
-struct a_block {
-  Outer_std140 inner[4];
-};
-
-layout(binding = 0) uniform a_block_1 {
+layout(binding = 0) uniform a_block_ubo {
   Outer_std140 inner[4];
 } a;
 

test/tint/buffer/uniform/std140/mat4x2/to_builtin.wgsl.expected.glsl

@@ -15,11 +15,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat4x2/to_fn.wgsl.expected.glsl

@@ -15,11 +15,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat4x2/to_private.wgsl.expected.glsl

@@ -15,11 +15,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/std140/mat4x2/to_storage.wgsl.expected.glsl

@@ -15,21 +15,14 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 
-struct s_block {
-  S inner[4];
-};
-
-layout(binding = 1, std430) buffer s_block_1 {
+layout(binding = 1, std430) buffer s_block_ssbo {
   S inner[4];
 } s;
+
 S conv_S(S_std140 val) {
   S tint_symbol = S(val.before, mat4x2(val.m_0, val.m_1, val.m_2, val.m_3), val.after);
   return tint_symbol;

test/tint/buffer/uniform/std140/mat4x2/to_workgroup.wgsl.expected.glsl

@@ -15,11 +15,7 @@ struct S_std140 {
   int after;
 };
 
-struct u_block {
-  S_std140 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   S_std140 inner[4];
 } u;
 

test/tint/buffer/uniform/types/array.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  vec4 inner[4];
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   vec4 inner[4];
 } u;
 

test/tint/buffer/uniform/types/f32.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  float inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   float inner;
 } u;
 

test/tint/buffer/uniform/types/i32.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  int inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   int inner;
 } u;
 

test/tint/buffer/uniform/types/mat2x2.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  mat2 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   mat2 inner;
 } u;
 

test/tint/buffer/uniform/types/mat2x3.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  mat2x3 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   mat2x3 inner;
 } u;
 

test/tint/buffer/uniform/types/mat3x2.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  mat3x2 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   mat3x2 inner;
 } u;
 

test/tint/buffer/uniform/types/mat4x4.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  mat4 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   mat4 inner;
 } u;
 

test/tint/buffer/uniform/types/struct.wgsl.expected.glsl

@@ -1,5 +1,3 @@
-SKIP: FAILED
-
 #version 310 es
 
 struct Inner {
@@ -10,12 +8,12 @@ struct S {
   Inner inner;
 };
 
-layout(binding = 0) uniform S_1 {
-  Inner inner;
+layout(binding = 0) uniform u_block_ubo {
+  S inner;
 } u;
 
 void tint_symbol() {
-  S x = u;
+  S x = u.inner;
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -23,10 +21,3 @@ void main() {
   tint_symbol();
   return;
 }
-Error parsing GLSL shader:
-ERROR: 0:16: '=' :  cannot convert from 'layout( binding=0 column_major shared) uniform block{layout( column_major shared) uniform structure{ global highp float f} inner}' to ' temp structure{ global structure{ global highp float f} inner}'
-ERROR: 0:16: '' : compilation terminated 
-ERROR: 2 compilation errors.  No code generated.
-
-
-

test/tint/buffer/uniform/types/struct.wgsl.expected.spvasm

@@ -1,19 +1,22 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 11
+; Bound: 16
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
+               OpName %u_block "u_block"
+               OpMemberName %u_block 0 "inner"
                OpName %S "S"
                OpMemberName %S 0 "inner"
                OpName %Inner "Inner"
                OpMemberName %Inner 0 "f"
                OpName %u "u"
                OpName %main "main"
-               OpDecorate %S Block
+               OpDecorate %u_block Block
+               OpMemberDecorate %u_block 0 Offset 0
                OpMemberDecorate %S 0 Offset 0
                OpMemberDecorate %Inner 0 Offset 0
                OpDecorate %u NonWritable
@@ -22,12 +25,17 @@
       %float = OpTypeFloat 32
       %Inner = OpTypeStruct %float
           %S = OpTypeStruct %Inner
-%_ptr_Uniform_S = OpTypePointer Uniform %S
-          %u = OpVariable %_ptr_Uniform_S Uniform
+    %u_block = OpTypeStruct %S
+%_ptr_Uniform_u_block = OpTypePointer Uniform %u_block
+          %u = OpVariable %_ptr_Uniform_u_block Uniform
        %void = OpTypeVoid
-          %6 = OpTypeFunction %void
-       %main = OpFunction %void None %6
-          %9 = OpLabel
-         %10 = OpLoad %S %u
+          %7 = OpTypeFunction %void
+       %uint = OpTypeInt 32 0
+     %uint_0 = OpConstant %uint 0
+%_ptr_Uniform_S = OpTypePointer Uniform %S
+       %main = OpFunction %void None %7
+         %10 = OpLabel
+         %14 = OpAccessChain %_ptr_Uniform_S %u %uint_0
+         %15 = OpLoad %S %14
                OpReturn
                OpFunctionEnd

test/tint/buffer/uniform/types/u32.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  uint inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   uint inner;
 } u;
 

test/tint/buffer/uniform/types/vec2.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  ivec2 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   ivec2 inner;
 } u;
 

test/tint/buffer/uniform/types/vec3.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  uvec3 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   uvec3 inner;
 } u;
 

test/tint/buffer/uniform/types/vec4.wgsl.expected.glsl

@@ -1,10 +1,6 @@
 #version 310 es
 
-struct u_block {
-  vec4 inner;
-};
-
-layout(binding = 0) uniform u_block_1 {
+layout(binding = 0) uniform u_block_ubo {
   vec4 inner;
 } u;