mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-10 14:08:04 +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
@@ -198,16 +198,16 @@ TEST(GetIdentifierTest, GetIdentifierTest1) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();"
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {"
|
||||
var<private> foo: f32 = 0.0;
|
||||
clamp_0acf8f();
|
||||
@@ -219,13 +219,13 @@ TEST(GetIdentifierTest, GetIdentifierTest1) {
|
||||
std::vector<std::pair<size_t, size_t>> ground_truth = {
|
||||
std::make_pair(3, 12), std::make_pair(28, 3), std::make_pair(37, 4),
|
||||
std::make_pair(49, 5), std::make_pair(60, 3), std::make_pair(68, 4),
|
||||
std::make_pair(81, 4), std::make_pair(111, 5), std::make_pair(133, 2),
|
||||
std::make_pair(143, 4), std::make_pair(155, 7), std::make_pair(175, 4),
|
||||
std::make_pair(196, 12), std::make_pair(222, 6), std::make_pair(234, 3),
|
||||
std::make_pair(258, 5), std::make_pair(282, 2), std::make_pair(294, 4),
|
||||
std::make_pair(311, 12), std::make_pair(343, 5), std::make_pair(359, 14),
|
||||
std::make_pair(385, 2), std::make_pair(396, 4), std::make_pair(414, 3),
|
||||
std::make_pair(427, 3), std::make_pair(432, 3), std::make_pair(451, 12)};
|
||||
std::make_pair(81, 4), std::make_pair(110, 5), std::make_pair(130, 2),
|
||||
std::make_pair(140, 4), std::make_pair(151, 7), std::make_pair(169, 4),
|
||||
std::make_pair(190, 12), std::make_pair(216, 6), std::make_pair(228, 3),
|
||||
std::make_pair(251, 5), std::make_pair(273, 2), std::make_pair(285, 4),
|
||||
std::make_pair(302, 12), std::make_pair(333, 5), std::make_pair(349, 14),
|
||||
std::make_pair(373, 2), std::make_pair(384, 4), std::make_pair(402, 3),
|
||||
std::make_pair(415, 3), std::make_pair(420, 3), std::make_pair(439, 12)};
|
||||
|
||||
ASSERT_EQ(ground_truth, identifiers_pos);
|
||||
}
|
||||
@@ -234,18 +234,18 @@ TEST(TestGetLiteralsValues, TestGetLiteralsValues1) {
|
||||
std::string wgsl_code =
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
}
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
@@ -277,17 +277,17 @@ TEST(InsertReturnTest, FindClosingBrace) {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
@@ -323,17 +323,17 @@ TEST(InsertReturnTest, FindClosingBraceFailing) {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
@@ -362,17 +362,17 @@ TEST(TestInsertReturn, TestInsertReturn1) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
@@ -395,17 +395,17 @@ TEST(TestInsertReturn, TestInsertReturn1) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());return true;
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
@@ -422,23 +422,23 @@ TEST(TestInsertReturn, TestFunctionPositions) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>());
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
clamp_0acf8f();
|
||||
}
|
||||
fn vert_main() -> [[builtin(position)]] vec4<f32> {
|
||||
fn vert_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f();
|
||||
var foo_1: i32 = 3;
|
||||
return vec4<f32>();
|
||||
@@ -447,7 +447,7 @@ TEST(TestInsertReturn, TestFunctionPositions) {
|
||||
var foo_3 : i32 = -20;)";
|
||||
|
||||
std::vector<size_t> function_positions = GetFunctionBodyPositions(wgsl_code);
|
||||
std::vector<size_t> expected_positions = {193, 622};
|
||||
std::vector<size_t> expected_positions = {187, 607};
|
||||
ASSERT_EQ(expected_positions, function_positions);
|
||||
}
|
||||
|
||||
@@ -456,23 +456,23 @@ TEST(TestInsertReturn, TestMissingSemicolon) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>())
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f()
|
||||
var foo_1: i32 = 3
|
||||
return vec4<f32>()
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
clamp_0acf8f();
|
||||
}
|
||||
fn vert_main() -> [[builtin(position)]] vec4<f32> {
|
||||
fn vert_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f()
|
||||
var foo_1: i32 = 3
|
||||
return vec4<f32>()
|
||||
@@ -489,23 +489,23 @@ TEST(TestInsertReturn, TestMissingSemicolon) {
|
||||
R"(fn clamp_0acf8f() {
|
||||
var res: vec2<f32> = clamp(vec2<f32>(), vec2<f32>(), vec2<f32>())
|
||||
}
|
||||
[[stage(vertex)]]
|
||||
fn vertex_main() -> [[builtin(position)]] vec4<f32> {
|
||||
@stage(vertex)
|
||||
fn vertex_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f()
|
||||
var foo_1: i32 = 3
|
||||
return vec4<f32>()
|
||||
}
|
||||
[[stage(fragment)]]
|
||||
@stage(fragment)
|
||||
fn fragment_main() {
|
||||
clamp_0acf8f();
|
||||
}
|
||||
[[stage(compute), workgroup_size(1)]]
|
||||
@stage(compute) @workgroup_size(1)
|
||||
fn compute_main() {
|
||||
var<private> foo: f32 = 0.0;
|
||||
var foo_2: i32 = 10;
|
||||
clamp_0acf8f();
|
||||
}
|
||||
fn vert_main() -> [[builtin(position)]] vec4<f32> {
|
||||
fn vert_main() -> @builtin(position) vec4<f32> {
|
||||
clamp_0acf8f()
|
||||
var foo_1: i32 = 3
|
||||
return vec4<f32>()
|
||||
|
||||
Reference in New Issue
Block a user