wgsl: Replace [[decoration]] with @decoration

Deprecate the old syntax. Migrate everything to the new syntax.

Bug: tint:1382
Change-Id: Ide12b2e927b17dc93b9714c7049090864cc568d3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/77260
Reviewed-by: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton
2022-01-19 22:46:57 +00:00
committed by Tint LUCI CQ
parent 8f1d5224ee
commit 01e4b6fc18
3200 changed files with 15906 additions and 15215 deletions

View File

@@ -8,18 +8,18 @@ struct Inner {
g : vec2<i32>;
h : vec2<i32>;
i : mat2x3<f32>;
[[align(16)]] j : mat3x2<f32>;
[[align(16)]] k : [[stride(16)]] array<vec4<i32>, 4>;
@align(16) j : mat3x2<f32>;
@align(16) k : @stride(16) array<vec4<i32>, 4>;
};
struct S {
arr : array<Inner, 8>;
};
[[binding(0), group(0)]] var<uniform> s : S;
@binding(0) @group(0) var<uniform> s : S;
[[stage(compute), workgroup_size(1)]]
fn main([[builtin(local_invocation_index)]] idx : u32) {
@stage(compute) @workgroup_size(1)
fn main(@builtin(local_invocation_index) idx : u32) {
let a = s.arr[idx].a;
let b = s.arr[idx].b;
let c = s.arr[idx].c;

View File

@@ -8,20 +8,20 @@ struct Inner {
g : vec2<i32>;
h : vec2<i32>;
i : mat2x3<f32>;
[[align(16)]]
@align(16)
j : mat3x2<f32>;
[[align(16)]]
k : [[stride(16)]] array<vec4<i32>, 4>;
@align(16)
k : @stride(16) array<vec4<i32>, 4>;
}
struct S {
arr : array<Inner, 8>;
}
[[binding(0), group(0)]] var<uniform> s : S;
@binding(0) @group(0) var<uniform> s : S;
[[stage(compute), workgroup_size(1)]]
fn main([[builtin(local_invocation_index)]] idx : u32) {
@stage(compute) @workgroup_size(1)
fn main(@builtin(local_invocation_index) idx : u32) {
let a = s.arr[idx].a;
let b = s.arr[idx].b;
let c = s.arr[idx].c;

View File

@@ -13,13 +13,13 @@ struct S {
h : vec2<i32>;
i : mat2x3<f32>;
j : mat3x2<f32>;
[[align(16)]] k : Inner;
[[align(16)]] l : [[stride(16)]] array<Inner, 4>;
@align(16) k : Inner;
@align(16) l : @stride(16) array<Inner, 4>;
};
[[binding(0), group(0)]] var<uniform> s : S;
@binding(0) @group(0) var<uniform> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a = s.a;
let b = s.b;

View File

@@ -13,15 +13,15 @@ struct S {
h : vec2<i32>;
i : mat2x3<f32>;
j : mat3x2<f32>;
[[align(16)]]
@align(16)
k : Inner;
[[align(16)]]
l : [[stride(16)]] array<Inner, 4>;
@align(16)
l : @stride(16) array<Inner, 4>;
}
[[binding(0), group(0)]] var<uniform> s : S;
@binding(0) @group(0) var<uniform> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a = s.a;
let b = s.b;

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : array<vec4<f32>, 4>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : array<vec4<f32>, 4>;
@group(0) @binding(0) var<uniform> u : array<vec4<f32>, 4>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : f32;
@group(0) @binding(0) var<uniform> u : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : i32;
@group(0) @binding(0) var<uniform> u : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : mat2x2<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : mat2x2<f32>;
@group(0) @binding(0) var<uniform> u : mat2x2<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : mat2x3<f32>;
@group(0) @binding(0) var<uniform> u : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : mat3x2<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : mat3x2<f32>;
@group(0) @binding(0) var<uniform> u : mat3x2<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : mat4x4<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : mat4x4<f32>;
@group(0) @binding(0) var<uniform> u : mat4x4<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -5,10 +5,10 @@ struct S {
inner : Inner;
};
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -6,9 +6,9 @@ struct S {
inner : Inner;
}
[[group(0), binding(0)]] var<uniform> u : S;
@group(0) @binding(0) var<uniform> u : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : u32;
@group(0) @binding(0) var<uniform> u : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : vec2<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : vec2<i32>;
@group(0) @binding(0) var<uniform> u : vec2<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : vec3<u32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : vec3<u32>;
@group(0) @binding(0) var<uniform> u : vec3<u32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,7 +1,7 @@
[[group(0), binding(0)]]
@group(0) @binding(0)
var<uniform> u : vec4<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}

View File

@@ -1,6 +1,6 @@
[[group(0), binding(0)]] var<uniform> u : vec4<f32>;
@group(0) @binding(0) var<uniform> u : vec4<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x = u;
}