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

tint: Remove semicolon as struct member delimeter

Browse Source 
Fixup a couple of internal Dawn shaders that used this syntax.

Fixed: tint:1475
Change-Id: Ibd6b3309944bfd955e724fef5d71d1297a84ef5f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/93361
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
dan sinclair
2022-07-04 16:58:00 +00:00
committed by Dawn LUCI CQ
parent 5286ea9d16
commit cfa951a662
7 changed files with 34 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tint/fuzzers/tint_ast_fuzzer/mutations/replace_identifier_test.cc
View File

@@ -275,8 +275,8 @@ TEST(ReplaceIdentifierTest, NotApplicable5) {
// (`read` for uniform storage class).
std::string shader = R"(
struct S {
a: i32;
};
a: i32
}
var<private> a: S;
@group(1) @binding(1) var<uniform> b: S;
@@ -310,8 +310,8 @@ TEST(ReplaceIdentifierTest, NotApplicable6) {
// Can't replace `ptr_b` with `a` since the latter is not a pointer.
std::string shader = R"(
struct S {
a: i32;
};
a: i32
}
var<private> a: S;
@group(1) @binding(1) var<uniform> b: S;
@@ -346,8 +346,8 @@ TEST(ReplaceIdentifierTest, NotApplicable8) {
// storage class.
std::string shader = R"(
struct S {
a: i32;
};
a: i32
}
var<private> a: S;
@group(1) @binding(1) var<uniform> b: S;
@@ -382,8 +382,8 @@ TEST(ReplaceIdentifierTest, NotApplicable9) {
// Can't replace `b` with `e` since the latter is not a reference.
std::string shader = R"(
struct S {
a: i32;
};
a: i32
}
var<private> a: S;
let e = 3;
@@ -418,8 +418,8 @@ TEST(ReplaceIdentifierTest, NotApplicable10) {
// Can't replace `b` with `e` since the latter has a wrong access mode.
std::string shader = R"(
struct S {
a: i32;
};
a: i32
}
var<private> a: S;
@group(0) @binding(0) var<storage, read_write> e: S;

6
src/tint/reader/wgsl/parser_impl.cc
View File

@@ -1348,12 +1348,6 @@ Expect<ast::StructMemberList> ParserImpl::expect_struct_body_decl() {
members.push_back(member.value);
}
// TODO(crbug.com/tint/1475): Remove support for semicolons.
if (auto sc = peek(); sc.Is(Token::Type::kSemicolon)) {
deprecated(sc.source(), "struct members should be separated with commas");
next();
continue;
}
if (!match(Token::Type::kComma)) {
break;
}

18
src/tint/reader/wgsl/parser_impl_struct_decl_test.cc
View File

@@ -104,23 +104,5 @@ TEST_F(ParserImplTest, StructDecl_MissingBracketLeft) {
EXPECT_EQ(p->error(), "1:10: expected '{' for struct declaration");
}
// TODO(crbug.com/tint/1475): Remove this.
TEST_F(ParserImplTest, DEPRECATED_StructDecl_Parses_WithSemicolons) {
auto p = parser(R"(
struct S {
a : i32;
b : f32;
})");
auto s = p->struct_decl();
EXPECT_FALSE(p->has_error());
EXPECT_FALSE(s.errored);
EXPECT_TRUE(s.matched);
ASSERT_NE(s.value, nullptr);
ASSERT_EQ(s->name, p->builder().Symbols().Register("S"));
ASSERT_EQ(s->members.size(), 2u);
EXPECT_EQ(s->members[0]->symbol, p->builder().Symbols().Register("a"));
EXPECT_EQ(s->members[1]->symbol, p->builder().Symbols().Register("b"));
}
} // namespace
} // namespace tint::reader::wgsl