encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-11 06:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgsl: Replace [[decoration]] with @decoration

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
test/array/assign_to_function_var.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -6,8 +6,8 @@ struct S {
var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
fn ret_arr() -> ArrayType {
return ArrayType();

6
test/array/assign_to_function_var.wgsl.expected.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -8,9 +8,9 @@ var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
fn ret_arr() -> ArrayType {
return ArrayType();

6
test/array/assign_to_private_var.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -6,8 +6,8 @@ struct S {
var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
var<private> dst : ArrayType;
var<private> dst_nested : array<array<array<i32, 2>, 3>, 4>;

6
test/array/assign_to_private_var.wgsl.expected.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -8,9 +8,9 @@ var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
var<private> dst : ArrayType;

10
test/array/assign_to_storage_var.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -10,11 +10,11 @@ struct S_nested {
var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
[[group(0), binding(2)]] var<storage, read_write> dst : S;
[[group(0), binding(3)]] var<storage, read_write> dst_nested : S_nested;
@group(0) @binding(2) var<storage, read_write> dst : S;
@group(0) @binding(3) var<storage, read_write> dst_nested : S_nested;
fn ret_arr() -> ArrayType {
return ArrayType();

10
test/array/assign_to_storage_var.wgsl.expected.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -12,13 +12,13 @@ var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
[[group(0), binding(2)]] var<storage, read_write> dst : S;
@group(0) @binding(2) var<storage, read_write> dst : S;
[[group(0), binding(3)]] var<storage, read_write> dst_nested : S_nested;
@group(0) @binding(3) var<storage, read_write> dst_nested : S_nested;
fn ret_arr() -> ArrayType {
return ArrayType();

6
test/array/assign_to_workgroup_var.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -6,8 +6,8 @@ struct S {
var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
var<workgroup> dst : ArrayType;
var<workgroup> dst_nested : array<array<array<i32, 2>, 3>, 4>;

6
test/array/assign_to_workgroup_var.wgsl.expected.wgsl
View File

@@ -1,4 +1,4 @@
type ArrayType = [[stride(16)]] array<i32, 4>;
type ArrayType = @stride(16) array<i32, 4>;
struct S {
arr : ArrayType;
@@ -8,9 +8,9 @@ var<private> src_private : ArrayType;
var<workgroup> src_workgroup : ArrayType;
[[group(0), binding(0)]] var<uniform> src_uniform : S;
@group(0) @binding(0) var<uniform> src_uniform : S;
[[group(0), binding(1)]] var<storage, read_write> src_storage : S;
@group(0) @binding(1) var<storage, read_write> src_storage : S;
var<workgroup> dst : ArrayType;

2
test/array/function_parameter.wgsl
View File

@@ -10,7 +10,7 @@ fn f3(a : array<array<array<f32, 4>, 3>, 2>) -> f32 {
return a[1][2][3];
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a1 : array<f32, 4> = array<f32, 4>();
let a2 : array<array<f32, 4>, 3> = array<array<f32, 4>, 3>();

2
test/array/function_parameter.wgsl.expected.wgsl
View File

@@ -10,7 +10,7 @@ fn f3(a : array<array<array<f32, 4>, 3>, 2>) -> f32 {
return a[1][2][3];
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a1 : array<f32, 4> = array<f32, 4>();
let a2 : array<array<f32, 4>, 3> = array<array<f32, 4>, 3>();

2
test/array/function_return_type.wgsl
View File

@@ -10,7 +10,7 @@ fn f3() -> array<array<array<f32, 4>, 3>, 2> {
return array<array<array<f32, 4>, 3>, 2>(f2(), f2());
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a1 : array<f32, 4> = f1();
let a2 : array<array<f32, 4>, 3> = f2();

2
test/array/function_return_type.wgsl.expected.wgsl
View File

@@ -10,7 +10,7 @@ fn f3() -> array<array<array<f32, 4>, 3>, 2> {
return array<array<array<f32, 4>, 3>, 2>(f2(), f2());
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let a1 : array<f32, 4> = f1();
let a2 : array<array<f32, 4>, 3> = f2();

2
test/array/size.wgsl
View File

@@ -1,7 +1,7 @@
let slen = 4;
let ulen = 4u;
[[stage(fragment)]]
@stage(fragment)
fn main() {
var signed_literal : array<f32, 4>;
var unsigned_literal : array<f32, 4u>;

2
test/array/size.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ let slen = 4;
let ulen = 4u;
[[stage(fragment)]]
@stage(fragment)
fn main() {
var signed_literal : array<f32, 4>;
var unsigned_literal : array<f32, 4u>;

2
test/array/type_constructor.wgsl
View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x : i32 = 42;

2
test/array/type_constructor.wgsl.expected.wgsl
View File

@@ -1,4 +1,4 @@
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn main() {
let x : i32 = 42;
let empty : array<i32, 4> = array<i32, 4>();