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

Program: Remove deprecated constructed-type methods

Browse Source 
Fixup all usages

Bug: tint:390
Change-Id: I739a7625cd385cb889369ab7c766462fbcd7cf12
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/38546
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton
2021-01-26 16:57:10 +00:00
parent a86f4effe4
commit 1b3d6e460c
17 changed files with 55 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/reader/spirv/parser_impl.cc
View File

@@ -969,7 +969,7 @@ type::Type* ParserImpl::ConvertType(
if (num_non_writable_members == members.size()) {
read_only_struct_types_.insert(result);
}
program_.AddConstructedType(result);
program_.AST().AddConstructedType(result);
return result;
}
@@ -1133,7 +1133,7 @@ void ParserImpl::MaybeGenerateAlias(uint32_t type_id,
program_.RegisterSymbol(name), ast_underlying_type);
// Record this new alias as the AST type for this SPIR-V ID.
id_to_type_[type_id] = ast_alias_type;
program_.AddConstructedType(ast_alias_type);
program_.AST().AddConstructedType(ast_alias_type);
}
bool ParserImpl::EmitModuleScopeVariables() {

4
src/reader/wgsl/parser_impl.cc
View File

@@ -347,7 +347,7 @@ Expect<bool> ParserImpl::expect_global_decl() {
if (!expect("type alias", Token::Type::kSemicolon))
return Failure::kErrored;
program_.AddConstructedType(ta.value);
program_.AST().AddConstructedType(ta.value);
return true;
}
@@ -362,7 +362,7 @@ Expect<bool> ParserImpl::expect_global_decl() {
auto* type = str.value;
register_constructed(
program_.SymbolToName(type->As<type::Struct>()->symbol()), type);
program_.AddConstructedType(type);
program_.AST().AddConstructedType(type);
return true;
}

32
src/reader/wgsl/parser_impl_global_decl_test.cc
View File

@@ -87,11 +87,11 @@ TEST_F(ParserImplTest, GlobalDecl_TypeAlias) {
ASSERT_FALSE(p->has_error()) << p->error();
auto& m = p->get_program();
ASSERT_EQ(m.constructed_types().size(), 1u);
ASSERT_TRUE(m.constructed_types()[0]->Is<type::Alias>());
EXPECT_EQ(
m.SymbolToName(m.constructed_types()[0]->As<type::Alias>()->symbol()),
"A");
ASSERT_EQ(m.AST().ConstructedTypes().size(), 1u);
ASSERT_TRUE(m.AST().ConstructedTypes()[0]->Is<type::Alias>());
EXPECT_EQ(m.SymbolToName(
m.AST().ConstructedTypes()[0]->As<type::Alias>()->symbol()),
"A");
}
TEST_F(ParserImplTest, GlobalDecl_TypeAlias_StructIdent) {
@@ -104,13 +104,13 @@ type B = A;)");
ASSERT_FALSE(p->has_error()) << p->error();
auto& m = p->get_program();
ASSERT_EQ(m.constructed_types().size(), 2u);
ASSERT_TRUE(m.constructed_types()[0]->Is<type::Struct>());
auto* str = m.constructed_types()[0]->As<type::Struct>();
ASSERT_EQ(m.AST().ConstructedTypes().size(), 2u);
ASSERT_TRUE(m.AST().ConstructedTypes()[0]->Is<type::Struct>());
auto* str = m.AST().ConstructedTypes()[0]->As<type::Struct>();
EXPECT_EQ(str->symbol(), p->get_program().RegisterSymbol("A"));
ASSERT_TRUE(m.constructed_types()[1]->Is<type::Alias>());
auto* alias = m.constructed_types()[1]->As<type::Alias>();
ASSERT_TRUE(m.AST().ConstructedTypes()[1]->Is<type::Alias>());
auto* alias = m.AST().ConstructedTypes()[1]->As<type::Alias>();
EXPECT_EQ(alias->symbol(), p->get_program().RegisterSymbol("B"));
EXPECT_EQ(alias->type(), str);
}
@@ -162,9 +162,9 @@ TEST_F(ParserImplTest, GlobalDecl_ParsesStruct) {
ASSERT_FALSE(p->has_error()) << p->error();
auto& m = p->get_program();
ASSERT_EQ(m.constructed_types().size(), 1u);
ASSERT_EQ(m.AST().ConstructedTypes().size(), 1u);
auto* t = m.constructed_types()[0];
auto* t = m.AST().ConstructedTypes()[0];
ASSERT_NE(t, nullptr);
ASSERT_TRUE(t->Is<type::Struct>());
@@ -181,9 +181,9 @@ TEST_F(ParserImplTest, GlobalDecl_Struct_WithStride) {
ASSERT_FALSE(p->has_error()) << p->error();
auto& m = p->get_program();
ASSERT_EQ(m.constructed_types().size(), 1u);
ASSERT_EQ(m.AST().ConstructedTypes().size(), 1u);
auto* t = m.constructed_types()[0];
auto* t = m.AST().ConstructedTypes()[0];
ASSERT_NE(t, nullptr);
ASSERT_TRUE(t->Is<type::Struct>());
@@ -205,9 +205,9 @@ TEST_F(ParserImplTest, GlobalDecl_Struct_WithDecoration) {
ASSERT_FALSE(p->has_error()) << p->error();
auto& m = p->get_program();
ASSERT_EQ(m.constructed_types().size(), 1u);
ASSERT_EQ(m.AST().ConstructedTypes().size(), 1u);
auto* t = m.constructed_types()[0];
auto* t = m.AST().ConstructedTypes()[0];
ASSERT_NE(t, nullptr);
ASSERT_TRUE(t->Is<type::Struct>());