tests: Stop using the [[block]] attribute

This has been deprecated and will soon be removed.

Bug: tint:1324
Change-Id: If5dbbc3a40d7591591fb2802dbe9c8dd5f96d299
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/72087
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

test/array/assign_to_function_var.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/array/assign_to_function_var.wgsl.expected.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/array/assign_to_private_var.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/array/assign_to_private_var.wgsl.expected.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/array/assign_to_storage_var.wgsl

@@ -1,11 +1,9 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
 
-[[block]]
 struct S_nested {
   arr : array<array<array<i32, 2>, 3>, 4>;
 };

test/array/assign_to_storage_var.wgsl.expected.wgsl

@@ -1,11 +1,9 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
 
-[[block]]
 struct S_nested {
   arr : array<array<array<i32, 2>, 3>, 4>;
 };

test/array/assign_to_workgroup_var.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/array/assign_to_workgroup_var.wgsl.expected.wgsl

@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };

test/buffer/storage/dynamic_index/read.wgsl

@@ -10,7 +10,6 @@ struct Inner {
     i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner>;
 };

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

@@ -10,7 +10,6 @@ struct Inner {
   i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner>;
 };

test/buffer/storage/dynamic_index/write.wgsl

@@ -10,7 +10,6 @@ struct Inner {
     i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner>;
 };

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

@@ -10,7 +10,6 @@ struct Inner {
   i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner>;
 };

test/buffer/storage/static_index/read.wgsl

@@ -2,7 +2,6 @@ struct Inner {
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;

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

@@ -2,7 +2,6 @@ struct Inner {
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;

test/buffer/storage/static_index/write.wgsl

@@ -2,7 +2,6 @@ struct Inner {
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;

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

@@ -2,7 +2,6 @@ struct Inner {
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;

test/buffer/uniform/dynamic_index/read.wgsl

@@ -12,7 +12,6 @@ struct Inner {
     [[align(16)]] k : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner, 8>;
 };

test/buffer/uniform/dynamic_index/read.wgsl.expected.wgsl

@@ -14,7 +14,6 @@ struct Inner {
   k : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner, 8>;
 };

test/buffer/uniform/static_index/read.wgsl

@@ -2,7 +2,6 @@ struct Inner {
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;

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

@@ -2,7 +2,6 @@ struct Inner {
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;

test/bug/chromium/1273230.wgsl

@@ -11,7 +11,7 @@ _ =   (vec4<f32>( 2.));
     _ = isNormal(4.);
     _ = isNormal(2.);
 
-}[[block]]
+}
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -21,7 +21,6 @@ struct Uniforms {
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -37,27 +36,22 @@ struct Dbg {
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };

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

@@ -29,7 +29,6 @@ fn marg8uintin() {
   _ = isNormal(2.0);
 }
 
-[[block]]
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -39,7 +38,6 @@ struct Uniforms {
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -55,27 +53,22 @@ struct Dbg {
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };

test/bug/dawn/947.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     u_scale : vec2<f32>;
     u_offset : vec2<f32>;
 };

test/bug/dawn/947.wgsl.expected.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   u_scale : vec2<f32>;
   u_offset : vec2<f32>;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,15 +1,12 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };
 [[group(0), binding(2)]] var<storage, read_write> result: Result;
 
-[[block]]
 struct SSBO {
   data: array<i32, 4>;
 };

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

@@ -1,18 +1,15 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };
 
 [[group(0), binding(2)]] var<storage, read_write> result : Result;
 
-[[block]]
 struct SSBO {
   data : array<i32, 4>;
 };

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

@@ -1,10 +1,8 @@
-[[block]]
 struct UBO {
   data: [[stride(16)]] array<i32, 4>;
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   data : [[stride(16)]] array<i32, 4>;
   dynamic_idx : i32;
@@ -6,7 +5,6 @@ struct UBO {
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

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

@@ -1,15 +1,12 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };
 [[group(0), binding(2)]] var<storage, read_write> result: Result;
 
-[[block]]
 struct SSBO {
   data: array<i32, 4>;
 };

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

@@ -1,18 +1,15 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };
 
 [[group(0), binding(2)]] var<storage, read_write> result : Result;
 
-[[block]]
 struct SSBO {
   data : array<i32, 4>;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@ struct UBO {
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@ struct S {
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };

test/bug/tint/1046.wgsl

@@ -3,11 +3,11 @@ struct PointLight {
     position : vec4<f32>;
 };
 
-[[block]] struct PointLights {
+ struct PointLights {
     values : [[stride(16)]] array<PointLight>;
 };
 
-[[block]] struct Uniforms {
+ struct Uniforms {
     worldView : mat4x4<f32>;
     proj : mat4x4<f32>;
     numPointLights : u32;

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

@@ -2,12 +2,10 @@ struct PointLight {
   position : vec4<f32>;
 };
 
-[[block]]
 struct PointLights {
   values : [[stride(16)]] array<PointLight>;
 };
 
-[[block]]
 struct Uniforms {
   worldView : mat4x4<f32>;
   proj : mat4x4<f32>;

test/bug/tint/1113.wgsl

@@ -1,5 +1,5 @@
 
-[[block]] struct Uniforms {
+ struct Uniforms {
     numTriangles     : u32;
     gridSize         : u32;
     pad1             : u32;
@@ -8,7 +8,7 @@
     bbMax            : vec3<f32>;      // offset(32)
 };
 
-[[block]] struct Dbg {
+ struct Dbg {
     offsetCounter : atomic<u32>;
     pad0 : u32;
     pad1 : u32;
@@ -23,11 +23,11 @@
     value_f32_3 : f32;
 };
 
-[[block]] struct F32s { values : [[stride(4)]] array<f32>; };
+ struct F32s { values : [[stride(4)]] array<f32>; };
-[[block]] struct U32s { values : [[stride(4)]] array<u32>; };
+ struct U32s { values : [[stride(4)]] array<u32>; };
-[[block]] struct I32s { values : [[stride(4)]] array<i32>; };
+ struct I32s { values : [[stride(4)]] array<i32>; };
-[[block]] struct AU32s { values : [[stride(4)]] array<atomic<u32>>; };
+ struct AU32s { values : [[stride(4)]] array<atomic<u32>>; };
-[[block]] struct AI32s { values : [[stride(4)]] array<atomic<i32>>; };
+ struct AI32s { values : [[stride(4)]] array<atomic<i32>>; };
 
 // IN
 [[binding(0), group(0)]] var<uniform> uniforms : Uniforms;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -8,7 +7,6 @@ struct Uniforms {
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -24,27 +22,22 @@ struct Dbg {
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };

test/bug/tint/1121.wgsl

@@ -12,7 +12,7 @@ struct LightData {
     color : vec3<f32>;
     radius : f32;
 };
-[[block]] struct LightsBuffer {
+ struct LightsBuffer {
     lights: array<LightData>;
 };
 [[group(0), binding(0)]] var<storage, read_write> lightsBuffer: LightsBuffer;
@@ -20,12 +20,12 @@ struct TileLightIdData {
     count: atomic<u32>;
     lightId: array<u32, 64>;
 };
-[[block]] struct Tiles {
+ struct Tiles {
     data: array<TileLightIdData, 4>;
 };
 [[group(1), binding(0)]] var<storage, read_write> tileLightId: Tiles;
   
-[[block]] struct Config {
+ struct Config {
     numLights : u32;
     numTiles : u32;
     tileCountX : u32;
@@ -34,7 +34,7 @@ struct TileLightIdData {
     tileSize : u32;
 };
 [[group(2), binding(0)]] var<uniform> config: Config;
-[[block]] struct Uniforms {
+ struct Uniforms {
     min : vec4<f32>;
     max : vec4<f32>;
     // camera

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

@@ -4,7 +4,6 @@ struct LightData {
   radius : f32;
 };
 
-[[block]]
 struct LightsBuffer {
   lights : array<LightData>;
 };
@@ -16,14 +15,12 @@ struct TileLightIdData {
   lightId : array<u32, 64>;
 };
 
-[[block]]
 struct Tiles {
   data : array<TileLightIdData, 4>;
 };
 
 [[group(1), binding(0)]] var<storage, read_write> tileLightId : Tiles;
 
-[[block]]
 struct Config {
   numLights : u32;
   numTiles : u32;
@@ -35,7 +32,6 @@ struct Config {
 
 [[group(2), binding(0)]] var<uniform> config : Config;
 
-[[block]]
 struct Uniforms {
   min : vec4<f32>;
   max : vec4<f32>;

test/bug/tint/1136.wgsl

@@ -1,3 +1,3 @@
-[[block]] struct Buffer { data: u32; };
+ struct Buffer { data: u32; };
 [[group(0), binding(0)]] var<storage, read_write> buffer: Buffer;
 fn main() { buffer.data = buffer.data + 1u;  }

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Buffer {
   data : u32;
 };

test/bug/tint/221.wgsl

@@ -1,6 +1,5 @@
 type Arr = array<u32, 50>;
 
-[[block]]
 struct Buf{
   count : u32;
   data : Arr;

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

@@ -1,6 +1,5 @@
 type Arr = array<u32, 50>;
 
-[[block]]
 struct Buf {
   count : u32;
   data : Arr;

test/bug/tint/294.wgsl

@@ -2,7 +2,7 @@ struct Light {
   position : vec3<f32>;
   colour : vec3<f32>;
 };
-[[block]] struct Lights {
+ struct Lights {
   light : [[stride(32)]] array<Light>;
 };
 [[group(0), binding(1)]] var<storage, read> lights : Lights;

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

@@ -3,7 +3,6 @@ struct Light {
   colour : vec3<f32>;
 };
 
-[[block]]
 struct Lights {
   light : [[stride(32)]] array<Light>;
 };

test/bug/tint/369.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct S {
+ struct S {
     m : mat2x2<f32>;
 };
 

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

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   m : mat2x2<f32>;
 };

test/bug/tint/403.wgsl

@@ -1,9 +1,7 @@
 
-[[block]]
 struct vertexUniformBuffer1 {
   transform1 : mat2x2<f32>;
 };
-[[block]]
 struct vertexUniformBuffer2 {
   transform2 : mat2x2<f32>;
 };

test/bug/tint/403.wgsl.expected.wgsl

@@ -1,9 +1,7 @@
-[[block]]
 struct vertexUniformBuffer1 {
   transform1 : mat2x2<f32>;
 };
 
-[[block]]
 struct vertexUniformBuffer2 {
   transform2 : mat2x2<f32>;
 };

test/bug/tint/492.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct S { a : i32; };
+ struct S { a : i32; };
 [[group(0), binding(0)]] var<storage, read_write> buf : S;
 
 [[stage(compute), workgroup_size(1)]] fn main() {

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

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };

test/bug/tint/534.wgsl

@@ -1,10 +1,10 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dstTextureFlipY : u32;
     isFloat16 : u32;
     isRGB10A2Unorm : u32;
     channelCount : u32;
 };
-[[block]] struct OutputBuf {
+ struct OutputBuf {
     result : [[stride(4)]] array<u32>;
 };
 [[group(0), binding(0)]] var src : texture_2d<f32>;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   dstTextureFlipY : u32;
   isFloat16 : u32;
@@ -6,7 +5,6 @@ struct Uniforms {
   channelCount : u32;
 };
 
-[[block]]
 struct OutputBuf {
   result : [[stride(4)]] array<u32>;
 };

test/bug/tint/744.wgsl

@@ -1,9 +1,9 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     aShape : vec2<u32>;
     bShape : vec2<u32>;
     outShape : vec2<u32>;
 };
-[[block]] struct Matrix {
+ struct Matrix {
     numbers: array<u32>;
 };
 

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

@@ -1,11 +1,9 @@
-[[block]]
 struct Uniforms {
   aShape : vec2<u32>;
   bShape : vec2<u32>;
   outShape : vec2<u32>;
 };
 
-[[block]]
 struct Matrix {
   numbers : array<u32>;
 };

test/bug/tint/757.wgsl

@@ -1,12 +1,12 @@
 
-[[block]] struct Constants {
+ struct Constants {
   level : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> constants : Constants;
 [[group(0), binding(1)]] var myTexture : texture_2d_array<f32>;
 
-[[block]] struct Result {
+ struct Result {
   values : [[stride(4)]] array<f32>;
 };
 [[group(0), binding(3)]] var<storage, read_write> result : Result;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Constants {
   level : i32;
 };
@@ -7,7 +6,6 @@ struct Constants {
 
 [[group(0), binding(1)]] var myTexture : texture_2d_array<f32>;
 
-[[block]]
 struct Result {
   values : [[stride(4)]] array<f32>;
 };

test/bug/tint/804.spv.expected.hlsl

@@ -1,7 +1,6 @@
 SKIP: FAILED
 
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };

test/bug/tint/807.spv.expected.hlsl

@@ -1,7 +1,6 @@
 SKIP: FAILED
 
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };

test/bug/tint/827.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct Result {
+ struct Result {
     values : array<f32>;
 };
 

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Result {
   values : array<f32>;
 };

test/bug/tint/913.wgsl

@@ -1,11 +1,11 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dstTextureFlipY : u32;
     channelCount    : u32;
     srcCopyOrigin   : vec2<u32>;
     dstCopyOrigin   : vec2<u32>;
     copySize        : vec2<u32>;
 };
-[[block]] struct OutputBuf {
+ struct OutputBuf {
     result : array<u32>;
 };
 [[group(0), binding(0)]] var src : texture_2d<f32>;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   dstTextureFlipY : u32;
   channelCount : u32;
@@ -7,7 +6,6 @@ struct Uniforms {
   copySize : vec2<u32>;
 };
 
-[[block]]
 struct OutputBuf {
   result : array<u32>;
 };

test/bug/tint/914.wgsl

@@ -1,9 +1,9 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dimAOuter : u32;
     dimInner : u32;
     dimBOuter : u32;
 };
-[[block]] struct Matrix {
+ struct Matrix {
     numbers: array<f32>;
 };
 

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

@@ -1,11 +1,9 @@
-[[block]]
 struct Uniforms {
   dimAOuter : u32;
   dimInner : u32;
   dimBOuter : u32;
 };
 
-[[block]]
 struct Matrix {
   numbers : array<f32>;
 };

test/bug/tint/922.wgsl

@@ -16,18 +16,15 @@ struct Mat4x2_ {
     my: vec4<f32>;
 };
 
-[[block]]
 struct ub_SceneParams {
     u_Projection: Mat4x4_;
 };
 
-[[block]]
 struct ub_MaterialParams {
     u_TexMtx: [[stride(32)]] array<Mat4x2_,1>;
     u_Misc0_: vec4<f32>;
 };
 
-[[block]]
 struct ub_PacketParams {
     u_PosMtx: [[stride(48)]] array<Mat4x3_,32>;
 };

test/bug/tint/922.wgsl.expected.wgsl

@@ -16,18 +16,15 @@ struct Mat4x2_ {
   my : vec4<f32>;
 };
 
-[[block]]
 struct ub_SceneParams {
   u_Projection : Mat4x4_;
 };
 
-[[block]]
 struct ub_MaterialParams {
   u_TexMtx : [[stride(32)]] array<Mat4x2_, 1>;
   u_Misc0_ : vec4<f32>;
 };
 
-[[block]]
 struct ub_PacketParams {
   u_PosMtx : [[stride(48)]] array<Mat4x3_, 32>;
 };

test/bug/tint/926.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct DrawIndirectArgs {
+ struct DrawIndirectArgs {
   vertexCount : atomic<u32>;
 };
 [[group(0), binding(5)]] var<storage, read_write> drawOut : DrawIndirectArgs;

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

@@ -1,4 +1,3 @@
-[[block]]
 struct DrawIndirectArgs {
   vertexCount : atomic<u32>;
 };

test/bug/tint/942.wgsl

@@ -1,4 +1,4 @@
-[[block]] struct Params {
+ struct Params {
   filterDim : u32;
   blockDim : u32;
 };
@@ -8,7 +8,7 @@
 [[group(1), binding(1)]] var inputTex : texture_2d<f32>;
 [[group(1), binding(2)]] var outputTex : texture_storage_2d<rgba8unorm, write>;
 
-[[block]] struct Flip {
+ struct Flip {
   value : u32;
 };
 [[group(1), binding(3)]] var<uniform> flip : Flip;

test/bug/tint/942.wgsl.expected.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct Params {
   filterDim : u32;
   blockDim : u32;
@@ -12,7 +11,6 @@ struct Params {
 
 [[group(1), binding(2)]] var outputTex : texture_storage_2d<rgba8unorm, write>;
 
-[[block]]
 struct Flip {
   value : u32;
 };

test/bug/tint/948.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct LeftOver {
   time : f32;
   [[size(12)]]

test/bug/tint/948.wgsl.expected.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct LeftOver {
   time : f32;
   [[size(12)]]

test/bug/tint/949.wgsl

@@ -4,7 +4,6 @@ struct lightingInfo {
   specular : vec3<f32>;
 };
 
-[[block]]
 struct LeftOver {
   u_World : mat4x4<f32>;
   u_ViewProjection : mat4x4<f32>;
@@ -19,7 +18,6 @@ struct LeftOver {
   tangentSpaceParameter0 : vec2<f32>;
 };
 
-[[block]]
 struct Light0 {
   vLightData : vec4<f32>;
   vLightDiffuse : vec4<f32>;

test/bug/tint/949.wgsl.expected.wgsl

@@ -3,7 +3,6 @@ struct lightingInfo {
   specular : vec3<f32>;
 };
 
-[[block]]
 struct LeftOver {
   u_World : mat4x4<f32>;
   u_ViewProjection : mat4x4<f32>;
@@ -18,7 +17,6 @@ struct LeftOver {
   tangentSpaceParameter0 : vec2<f32>;
 };
 
-[[block]]
 struct Light0 {
   vLightData : vec4<f32>;
   vLightDiffuse : vec4<f32>;

test/bug/tint/959.wgsl

@@ -3,7 +3,6 @@
 // MSL. Use some high binding numbers to also test that the remapped numbers are
 // densely packed starting at 0.
 
-[[block]]
 struct S {
   a : f32;
 };

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

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : f32;
 };

test/bug/tint/980.wgsl

@@ -5,7 +5,7 @@ fn Bad(index: u32, rd: vec3<f32>) -> vec3<f32> {
   return normalize(normal);
 }
 
-[[block]] struct S { v : vec3<f32>; i : u32; };
+ struct S { v : vec3<f32>; i : u32; };
 [[binding(0), group(0)]] var<storage, read_write> io : S;
 [[stage(compute), workgroup_size(1)]]
 fn main([[builtin(local_invocation_index)]] idx : u32) {

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

@@ -4,7 +4,6 @@ fn Bad(index : u32, rd : vec3<f32>) -> vec3<f32> {
   return normalize(normal);
 }
 
-[[block]]
 struct S {
   v : vec3<f32>;
   i : u32;

test/bug/tint/993.wgsl

@@ -1,15 +1,15 @@
 
-[[block]] struct Constants {
+ struct Constants {
   zero: u32;
 };
 [[group(1), binding(0)]] var<uniform> constants: Constants;
 
-[[block]] struct Result {
+ struct Result {
   value: u32;
 };
 [[group(1), binding(1)]] var<storage, write> result: Result;
 
-[[block]] struct TestData {
+ struct TestData {
   data: array<atomic<i32>,3>;
 };
 [[group(0), binding(0)]] var<storage, read_write> s: TestData;

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

@@ -1,18 +1,15 @@
-[[block]]
 struct Constants {
   zero : u32;
 };
 
 [[group(1), binding(0)]] var<uniform> constants : Constants;
 
-[[block]]
 struct Result {
   value : u32;
 };
 
 [[group(1), binding(1)]] var<storage, write> result : Result;
 
-[[block]]
 struct TestData {
   data : array<atomic<i32>, 3>;
 };

test/bug/tint/998.wgsl

@@ -1,9 +1,9 @@
-[[block]] struct Constants {
+ struct Constants {
   zero: u32;
 };
 [[group(1), binding(0)]] var<uniform> constants: Constants;
 
-[[block]] struct Result {
+ struct Result {
   value: u32;
 };
 [[group(1), binding(1)]] var<storage, write> result: Result;

test/bug/tint/998.wgsl.expected.wgsl

@@ -1,11 +1,9 @@
-[[block]]
 struct Constants {
   zero : u32;
 };
 
 [[group(1), binding(0)]] var<uniform> constants : Constants;
 
-[[block]]
 struct Result {
   value : u32;
 };

test/expressions/binary/mul/mat3x2-vec3/f32.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat3x2<f32>;
     vector : vec3<f32>;

test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat3x2<f32>;
   vector : vec3<f32>;

test/expressions/binary/mul/mat3x3-vec3/f32.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat3x3<f32>;
     vector : vec3<f32>;

test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat3x3<f32>;
   vector : vec3<f32>;