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

@@ -33,7 +33,7 @@ fn var_decls() {
var v15 = ret_MyArray();
}
[[stage(fragment)]]
fn main() -> [[location(0)]] vec4<f32> {
@stage(fragment)
fn main() -> @location(0) vec4<f32> {
return vec4<f32>(0.0,0.0,0.0,0.0);
}

View File

@@ -42,7 +42,7 @@ fn var_decls() {
var v15 = ret_MyArray();
}
[[stage(fragment)]]
fn main() -> [[location(0)]] vec4<f32> {
@stage(fragment)
fn main() -> @location(0) vec4<f32> {
return vec4<f32>(0.0, 0.0, 0.0, 0.0);
}

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : array<i32, 3>;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : array<i32, 3>;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : mat2x3<f32>;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : mat2x3<f32>;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : i32;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : i32;
_ = v;

View File

@@ -3,7 +3,7 @@ struct S {
b : f32;
};
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : S;
_ = v;

View File

@@ -3,7 +3,7 @@ struct S {
b : f32;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : S;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : vec3<i32>;
_ = v;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : vec3<i32>;
_ = v;

View File

@@ -1,6 +1,6 @@
var<private> v : array<i32, 3>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : array<i32, 3>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -5,7 +5,7 @@ struct S {
var<private> v : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -5,7 +5,7 @@ struct S {
var<private> v : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : vec3<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<private> v : vec3<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : array<i32, 3>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : array<i32, 3>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : mat2x3<f32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -5,7 +5,7 @@ struct S {
var<workgroup> v : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -5,7 +5,7 @@ struct S {
var<workgroup> v : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : vec3<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
var<workgroup> v : vec3<i32>;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = v;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool;
@override let o : bool;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool;
@override let o : bool;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32;
@override let o : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32;
@override let o : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32;
@override let o : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32;
@override let o : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32;
@override let o : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32;
@override let o : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool = true;
@override let o : bool = true;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool = true;
@override let o : bool = true;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32 = 1.0;
@override let o : f32 = 1.0;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32 = 1.0;
@override let o : f32 = 1.0;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32 = 1;
@override let o : i32 = 1;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32 = 1;
@override let o : i32 = 1;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32 = 1u;
@override let o : u32 = 1u;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32 = 1u;
@override let o : u32 = 1u;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool = bool();
@override let o : bool = bool();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : bool = bool();
@override let o : bool = bool();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32 = f32();
@override let o : f32 = f32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : f32 = f32();
@override let o : f32 = f32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32 = i32();
@override let o : i32 = i32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : i32 = i32();
@override let o : i32 = i32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32 = u32();
@override let o : u32 = u32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override]] let o : u32 = u32();
@override let o : u32 = u32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool;
@override(1234) let o : bool;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool;
@override(1234) let o : bool;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32;
@override(1234) let o : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32;
@override(1234) let o : f32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32;
@override(1234) let o : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32;
@override(1234) let o : i32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32;
@override(1234) let o : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32;
@override(1234) let o : u32;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool = true;
@override(1234) let o : bool = true;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool = true;
@override(1234) let o : bool = true;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32 = 1.0;
@override(1234) let o : f32 = 1.0;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32 = 1.0;
@override(1234) let o : f32 = 1.0;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32 = 1;
@override(1234) let o : i32 = 1;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32 = 1;
@override(1234) let o : i32 = 1;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32 = 1u;
@override(1234) let o : u32 = 1u;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32 = 1u;
@override(1234) let o : u32 = 1u;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool = bool();
@override(1234) let o : bool = bool();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : bool = bool();
@override(1234) let o : bool = bool();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32 = f32();
@override(1234) let o : f32 = f32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : f32 = f32();
@override(1234) let o : f32 = f32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32 = i32();
@override(1234) let o : i32 = i32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : i32 = i32();
@override(1234) let o : i32 = i32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32 = u32();
@override(1234) let o : u32 = u32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -1,6 +1,6 @@
[[override(1234)]] let o : u32 = u32();
@override(1234) let o : u32 = u32();
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = o;
}

View File

@@ -99,8 +99,8 @@ var<workgroup> m97 : mat2x2<f32>;
var<workgroup> m98 : mat2x2<f32>;
var<workgroup> m99 : mat2x2<f32>;
[[stage(compute), workgroup_size(1)]]
fn tint_symbol([[builtin(local_invocation_index)]] idx : u32) {
@stage(compute) @workgroup_size(1)
fn tint_symbol(@builtin(local_invocation_index) idx : u32) {
m00[0][0] = 1.0;
m01[0][0] = 1.0;
m02[0][0] = 1.0;
@@ -201,4 +201,4 @@ fn tint_symbol([[builtin(local_invocation_index)]] idx : u32) {
m97[0][0] = 1.0;
m98[0][0] = 1.0;
m99[0][0] = 1.0;
}
}

View File

@@ -198,8 +198,8 @@ var<workgroup> m98 : mat2x2<f32>;
var<workgroup> m99 : mat2x2<f32>;
[[stage(compute), workgroup_size(1)]]
fn tint_symbol([[builtin(local_invocation_index)]] idx : u32) {
@stage(compute) @workgroup_size(1)
fn tint_symbol(@builtin(local_invocation_index) idx : u32) {
m00[0][0] = 1.0;
m01[0][0] = 1.0;
m02[0][0] = 1.0;

View File

@@ -25,25 +25,25 @@ fn outer() {
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main1() {
a = 42;
uses_a();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main2() {
b = 7;
uses_b();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main3() {
outer();
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main4() {
no_uses();
}

View File

@@ -27,25 +27,25 @@ fn outer() {
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main1() {
a = 42;
uses_a();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main2() {
b = 7;
uses_b();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main3() {
outer();
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main4() {
no_uses();
}

View File

@@ -25,25 +25,25 @@ fn outer() {
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main1() {
a = 42;
uses_a();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main2() {
b = 7;
uses_b();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main3() {
outer();
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main4() {
no_uses();
}

View File

@@ -27,25 +27,25 @@ fn outer() {
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main1() {
a = 42;
uses_a();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main2() {
b = 7;
uses_b();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main3() {
outer();
no_uses();
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main4() {
no_uses();
}