encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-12 06:45:16 +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/bug/fxc/dyn_array_idx/read/function.wgsl
View File

@@ -1,16 +1,16 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
result.out = s.data[ubo.dynamic_idx];

6
test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,9 +12,9 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
result.out = s.data[ubo.dynamic_idx];

6
test/bug/fxc/dyn_array_idx/read/private.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
var<private> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = s.data[ubo.dynamic_idx];
}

6
test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,11 +12,11 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
var<private> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = s.data[ubo.dynamic_idx];
}

8
test/bug/fxc/dyn_array_idx/read/storage.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct Result {
out: i32;
};
[[group(0), binding(2)]] var<storage, read_write> result: Result;
@group(0) @binding(2) var<storage, read_write> result: Result;
struct SSBO {
data: array<i32, 4>;
};
[[group(0), binding(1)]] var<storage, read_write> ssbo: SSBO;
@group(0) @binding(1) var<storage, read_write> ssbo: SSBO;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = ssbo.data[ubo.dynamic_idx];
}

8
test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.wgsl
View File

@@ -2,21 +2,21 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct Result {
out : i32;
}
[[group(0), binding(2)]] var<storage, read_write> result : Result;
@group(0) @binding(2) var<storage, read_write> result : Result;
struct SSBO {
data : array<i32, 4>;
}
[[group(0), binding(1)]] var<storage, read_write> ssbo : SSBO;
@group(0) @binding(1) var<storage, read_write> ssbo : SSBO;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = ssbo.data[ubo.dynamic_idx];
}

8
test/bug/fxc/dyn_array_idx/read/uniform.wgsl
View File

@@ -1,14 +1,14 @@
struct UBO {
data: [[stride(16)]] array<i32, 4>;
data: @stride(16) array<i32, 4>;
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct Result {
out: i32;
};
[[group(0), binding(2)]] var<storage, read_write> result: Result;
@group(0) @binding(2) var<storage, read_write> result: Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = ubo.data[ubo.dynamic_idx];
}

8
test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.wgsl
View File

@@ -1,17 +1,17 @@
struct UBO {
data : [[stride(16)]] array<i32, 4>;
data : @stride(16) array<i32, 4>;
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct Result {
out : i32;
}
[[group(0), binding(2)]] var<storage, read_write> result : Result;
@group(0) @binding(2) var<storage, read_write> result : Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = ubo.data[ubo.dynamic_idx];
}

6
test/bug/fxc/dyn_array_idx/read/workgroup.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
var<workgroup> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = s.data[ubo.dynamic_idx];
}

6
test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,11 +12,11 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
var<workgroup> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
result.out = s.data[ubo.dynamic_idx];
}

6
test/bug/fxc/dyn_array_idx/write/function.wgsl
View File

@@ -1,16 +1,16 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
s.data[ubo.dynamic_idx] = 1;

6
test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,9 +12,9 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
s.data[ubo.dynamic_idx] = 1;

6
test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl
View File

@@ -1,20 +1,20 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
fn x(p : ptr<function, S>) {
(*p).data[ubo.dynamic_idx] = 1;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
x(&s);

6
test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,13 +12,13 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
fn x(p : ptr<function, S>) {
(*(p)).data[ubo.dynamic_idx] = 1;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
var s : S;
x(&(s));

6
test/bug/fxc/dyn_array_idx/write/private.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
var<private> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
s.data[ubo.dynamic_idx] = 1;
result.out = s.data[3];

6
test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,11 +12,11 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
var<private> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
s.data[ubo.dynamic_idx] = 1;
result.out = s.data[3];

6
test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl
View File

@@ -1,14 +1,14 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
var<private> s : S;
@@ -16,7 +16,7 @@ fn x(p : ptr<private, S>) {
(*p).data[ubo.dynamic_idx] = 1;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
x(&s);
result.out = s.data[3];

6
test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,7 +12,7 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
var<private> s : S;
@@ -20,7 +20,7 @@ fn x(p : ptr<private, S>) {
(*(p)).data[ubo.dynamic_idx] = 1;
}
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
x(&(s));
result.out = s.data[3];

8
test/bug/fxc/dyn_array_idx/write/storage.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct Result {
out: i32;
};
[[group(0), binding(2)]] var<storage, read_write> result: Result;
@group(0) @binding(2) var<storage, read_write> result: Result;
struct SSBO {
data: array<i32, 4>;
};
[[group(0), binding(1)]] var<storage, read_write> ssbo: SSBO;
@group(0) @binding(1) var<storage, read_write> ssbo: SSBO;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
ssbo.data[ubo.dynamic_idx] = 1;
result.out = ssbo.data[3];

8
test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.wgsl
View File

@@ -2,21 +2,21 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct Result {
out : i32;
}
[[group(0), binding(2)]] var<storage, read_write> result : Result;
@group(0) @binding(2) var<storage, read_write> result : Result;
struct SSBO {
data : array<i32, 4>;
}
[[group(0), binding(1)]] var<storage, read_write> ssbo : SSBO;
@group(0) @binding(1) var<storage, read_write> ssbo : SSBO;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
ssbo.data[ubo.dynamic_idx] = 1;
result.out = ssbo.data[3];

6
test/bug/fxc/dyn_array_idx/write/workgroup.wgsl
View File

@@ -1,18 +1,18 @@
struct UBO {
dynamic_idx: i32;
};
[[group(0), binding(0)]] var<uniform> ubo: UBO;
@group(0) @binding(0) var<uniform> ubo: UBO;
struct S {
data: array<i32, 64>;
};
struct Result {
out: i32;
};
[[group(0), binding(1)]] var<storage, read_write> result: Result;
@group(0) @binding(1) var<storage, read_write> result: Result;
var<workgroup> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
s.data[ubo.dynamic_idx] = 1;
result.out = s.data[3];

6
test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.wgsl
View File

@@ -2,7 +2,7 @@ struct UBO {
dynamic_idx : i32;
}
[[group(0), binding(0)]] var<uniform> ubo : UBO;
@group(0) @binding(0) var<uniform> ubo : UBO;
struct S {
data : array<i32, 64>;
@@ -12,11 +12,11 @@ struct Result {
out : i32;
}
[[group(0), binding(1)]] var<storage, read_write> result : Result;
@group(0) @binding(1) var<storage, read_write> result : Result;
var<workgroup> s : S;
[[stage(compute), workgroup_size(1)]]
@stage(compute) @workgroup_size(1)
fn f() {
s.data[ubo.dynamic_idx] = 1;
result.out = s.data[3];