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

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -21,9 +21,9 @@ fn getNextIndex() -> u32 {
return nextIndex;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;

View File

@@ -22,9 +22,9 @@ fn getNextIndex() -> u32 {
return nextIndex;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -11,9 +11,9 @@ struct OuterS {
a1 : array<array<InnerS, 8>, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -11,9 +11,9 @@ struct OuterS {
a1 : array<array<InnerS, 8>, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -14,9 +14,9 @@ struct OuterS {
a1 : array<S1, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -14,9 +14,9 @@ struct OuterS {
a1 : array<S1, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -15,9 +15,9 @@ struct OuterS {
a1 : array<S1, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;

View File

@@ -15,9 +15,9 @@ struct OuterS {
a1 : array<S1, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;

View File

@@ -10,10 +10,10 @@ struct OuterS {
a1 : array<InnerS>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
[[binding(0), group(0)]] var<storage, read_write> s1 : OuterS;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s1 : OuterS;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s1.a1[uniforms.i] = v;

View File

@@ -10,11 +10,11 @@ struct OuterS {
a1 : array<InnerS>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[binding(0), group(0)]] var<storage, read_write> s1 : OuterS;
@binding(0) @group(0) var<storage, read_write> s1 : OuterS;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s1.a1[uniforms.i] = v;

View File

@@ -15,10 +15,10 @@ struct OuterS {
a1 : array<S1>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
[[binding(0), group(0)]] var<storage, read_write> s : OuterS;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s : OuterS;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s.a1[uniforms.i].a2[uniforms.j] = v;

View File

@@ -15,11 +15,11 @@ struct OuterS {
a1 : array<S1>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[binding(0), group(0)]] var<storage, read_write> s : OuterS;
@binding(0) @group(0) var<storage, read_write> s : OuterS;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s.a1[uniforms.i].a2[uniforms.j] = v;

View File

@@ -6,9 +6,9 @@ struct OuterS {
m1 : mat2x4<f32>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.m1[uniforms.i] = vec4<f32>(1.0);

View File

@@ -6,9 +6,9 @@ struct OuterS {
m1 : mat2x4<f32>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.m1[uniforms.i] = vec4<f32>(1.0);

View File

@@ -11,9 +11,9 @@ struct OuterS {
a2 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -11,9 +11,9 @@ struct OuterS {
a2 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -14,9 +14,9 @@ struct OuterS {
s2 : S1;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -14,9 +14,9 @@ struct OuterS {
s2 : S1;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -6,9 +6,9 @@ struct OuterS {
v1 : vec3<f32>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.v1[uniforms.i] = 1.0;

View File

@@ -6,9 +6,9 @@ struct OuterS {
v1 : vec3<f32>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.v1[uniforms.i] = 1.0;

View File

@@ -6,13 +6,13 @@ struct OuterS {
a1 : array<u32, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(i: u32) -> u32 {
return i + 1u;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
var v : vec3<f32>;

View File

@@ -6,13 +6,13 @@ struct OuterS {
a1 : array<u32, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(i : u32) -> u32 {
return (i + 1u);
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
var v : vec3<f32>;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -10,9 +10,9 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;

View File

@@ -7,14 +7,14 @@ struct InnerS {
struct OuterS {
a1 : array<InnerS, 8>;
};
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(p : ptr<function, OuterS>) {
var v : InnerS;
(*p).a1[uniforms.i] = v;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
f(&s1);

View File

@@ -10,14 +10,14 @@ struct OuterS {
a1 : array<InnerS, 8>;
}
[[group(1), binding(4)]] var<uniform> uniforms : Uniforms;
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(p : ptr<function, OuterS>) {
var v : InnerS;
(*(p)).a1[uniforms.i] = v;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
f(&(s1));

View File

@@ -2,9 +2,9 @@ struct S {
arr : array<i32>;
};
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = &s;
}

View File

@@ -2,9 +2,9 @@ struct S {
arr : array<i32>;
}
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = &(s);
}

View File

@@ -2,9 +2,9 @@ struct S {
arr : array<i32>;
};
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = &s.arr;
}

View File

@@ -2,9 +2,9 @@ struct S {
arr : array<i32>;
}
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = &(s.arr);
}

View File

@@ -2,7 +2,7 @@ fn f(a: i32, b: i32, c: i32) -> i32 {
return a * b + c;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = f(1, 2, 3);
}

View File

@@ -2,7 +2,7 @@ fn f(a : i32, b : i32, c : i32) -> i32 {
return ((a * b) + c);
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = f(1, 2, 3);
}

View File

@@ -2,7 +2,7 @@ fn f(a: i32, b: i32, c: i32) -> i32 {
return a * b + c;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = f(1, 2, 3) + f(4, 5, 6) * f(7, f(8, 9, 10), 11);
}

View File

@@ -2,7 +2,7 @@ fn f(a : i32, b : i32, c : i32) -> i32 {
return ((a * b) + c);
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = (f(1, 2, 3) + (f(4, 5, 6) * f(7, f(8, 9, 10), 11)));
}

View File

@@ -2,9 +2,9 @@ struct S {
i : i32;
};
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = s;
_ = s.i;

View File

@@ -2,9 +2,9 @@ struct S {
i : i32;
}
[[binding(0), group(0)]] var<storage, read_write> s : S;
@binding(0) @group(0) var<storage, read_write> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = s;
_ = s.i;

View File

@@ -2,9 +2,9 @@ struct S {
i : i32;
};
[[binding(0), group(0)]] var<uniform> u : S;
@binding(0) @group(0) var<uniform> u : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = u;
_ = u.i;

View File

@@ -2,9 +2,9 @@ struct S {
i : i32;
}
[[binding(0), group(0)]] var<uniform> u : S;
@binding(0) @group(0) var<uniform> u : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
_ = u;
_ = u.i;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
var result : i32;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
var result : i32;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
switch(i) {

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
switch(i) {

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
var result : i32;

View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var i : i32;
var result : i32;