mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-09 21:47:47 +00:00
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:
committed by
Tint LUCI CQ
parent
8f1d5224ee
commit
01e4b6fc18
@@ -5,7 +5,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var m : mat3x3<f32> = mat3x3<f32>(vec3<f32>(1., 2., 3.), vec3<f32>(4., 5., 6.), vec3<f32>(7., 8., 9.));
|
||||
let v : ptr<function, vec3<f32>> = &m[1];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var m : mat3x3<f32> = mat3x3<f32>(vec3<f32>(1.0, 2.0, 3.0), vec3<f32>(4.0, 5.0, 6.0), vec3<f32>(7.0, 8.0, 9.0));
|
||||
let v : ptr<function, vec3<f32>> = &(m[1]);
|
||||
|
||||
@@ -5,7 +5,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> I : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let i : i32 = I;
|
||||
let use : i32 = i + 1;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> I : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let i : i32 = I;
|
||||
let use : i32 = (i + 1);
|
||||
|
||||
@@ -11,7 +11,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ struct S {
|
||||
|
||||
var<private> V : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let i : i32 = V.i;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ struct S {
|
||||
|
||||
var<private> V : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let i : i32 = V.i;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let use : i32 = i + 1;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let use : i32 = (i + 1);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let p : ptr<function, i32> = &i;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let p : ptr<function, i32> = &(i);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> i : i32 = 123;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<private, i32> = &i;
|
||||
let use : i32 = *p + 1;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> i : i32 = 123;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<private, i32> = &(i);
|
||||
let use : i32 = (*(p) + 1);
|
||||
|
||||
@@ -2,10 +2,10 @@ struct S {
|
||||
a : i32;
|
||||
};
|
||||
|
||||
[[group(0), binding(0)]]
|
||||
@group(0) @binding(0)
|
||||
var<storage, read_write> v : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<storage, i32, read_write> = &v.a;
|
||||
let use : i32 = *p + 1;
|
||||
|
||||
@@ -2,9 +2,9 @@ struct S {
|
||||
a : i32;
|
||||
}
|
||||
|
||||
[[group(0), binding(0)]] var<storage, read_write> v : S;
|
||||
@group(0) @binding(0) var<storage, read_write> v : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<storage, i32, read_write> = &(v.a);
|
||||
let use : i32 = (*(p) + 1);
|
||||
|
||||
@@ -2,10 +2,10 @@ struct S {
|
||||
a : i32;
|
||||
};
|
||||
|
||||
[[group(0), binding(0)]]
|
||||
@group(0) @binding(0)
|
||||
var<uniform> v : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<uniform, i32> = &v.a;
|
||||
let use : i32 = *p + 1;
|
||||
|
||||
@@ -2,9 +2,9 @@ struct S {
|
||||
a : i32;
|
||||
}
|
||||
|
||||
[[group(0), binding(0)]] var<uniform> v : S;
|
||||
@group(0) @binding(0) var<uniform> v : S;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
let p : ptr<uniform, i32> = &(v.a);
|
||||
let use : i32 = (*(p) + 1);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<workgroup> i : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
i = 123;
|
||||
let p : ptr<workgroup, i32> = &i;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<workgroup> i : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
i = 123;
|
||||
let p : ptr<workgroup, i32> = &(i);
|
||||
|
||||
@@ -10,7 +10,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ struct S {
|
||||
i : i32;
|
||||
};
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var V : S;
|
||||
var i : i32 = V.i;
|
||||
|
||||
@@ -2,7 +2,7 @@ struct S {
|
||||
i : i32;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var V : S;
|
||||
var i : i32 = V.i;
|
||||
|
||||
@@ -11,7 +11,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ fn func(value : i32, pointer : ptr<function, i32>) -> i32 {
|
||||
return value + *pointer;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let r : i32 = func(i, &i);
|
||||
|
||||
@@ -2,7 +2,7 @@ fn func(value : i32, pointer : ptr<function, i32>) -> i32 {
|
||||
return (value + *(pointer));
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let r : i32 = func(i, &(i));
|
||||
|
||||
@@ -6,7 +6,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> I : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
I = 123; // constant
|
||||
I = 100 + 20 + 3; // dynamic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var<private> I : i32;
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
I = 123;
|
||||
I = ((100 + 20) + 3);
|
||||
|
||||
@@ -9,7 +9,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let p : ptr<function, i32> = &i;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
let p : ptr<function, i32> = &(i);
|
||||
|
||||
@@ -8,7 +8,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ fn main_1() {
|
||||
return;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1, 1, 1)]]
|
||||
@stage(compute) @workgroup_size(1, 1, 1)
|
||||
fn main() {
|
||||
main_1();
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ fn func(value : i32, pointer : ptr<function, i32>) {
|
||||
*pointer = value;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
func(123, &i);
|
||||
|
||||
@@ -2,7 +2,7 @@ fn func(value : i32, pointer : ptr<function, i32>) {
|
||||
*(pointer) = value;
|
||||
}
|
||||
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn main() {
|
||||
var i : i32 = 123;
|
||||
func(123, &(i));
|
||||
|
||||
Reference in New Issue
Block a user