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

Replace Type::(Is|As)Matrix with Castable

Browse Source 
Change-Id: I861aed231604a8bfba1f4cf3659b4863556fc3c4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/34268
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton
2020-11-30 23:30:58 +00:00
parent 9857f81e94
commit d8457c15f1
32 changed files with 144 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1359,8 +1359,8 @@ ast::Expression* ParserImpl::MakeNullValue(ast::type::Type* type) {
return create<ast::TypeConstructorExpression>(type,
std::move(ast_components));
}
if (type->IsMatrix()) {
const auto* mat_ty = type->AsMatrix();
if (type->Is<ast::type::MatrixType>()) {
const auto* mat_ty = type->As<ast::type::MatrixType>();
// Matrix components are columns
auto* column_ty = ast_module_.create<ast::type::VectorType>(mat_ty->type(),
mat_ty->rows());

81
src/reader/spirv/parser_impl_convert_type_test.cc
View File

@@ -276,58 +276,67 @@ TEST_F(SpvParserTest, ConvertType_MatrixOverF32) {
EXPECT_TRUE(p->BuildInternalModule());
auto* m22 = p->ConvertType(22);
EXPECT_TRUE(m22->IsMatrix());
EXPECT_TRUE(m22->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m22->AsMatrix()->rows(), 2u);
EXPECT_EQ(m22->AsMatrix()->columns(), 2u);
EXPECT_TRUE(m22->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m22->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m22->As<ast::type::MatrixType>()->rows(), 2u);
EXPECT_EQ(m22->As<ast::type::MatrixType>()->columns(), 2u);
auto* m23 = p->ConvertType(23);
EXPECT_TRUE(m23->IsMatrix());
EXPECT_TRUE(m23->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m23->AsMatrix()->rows(), 2u);
EXPECT_EQ(m23->AsMatrix()->columns(), 3u);
EXPECT_TRUE(m23->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m23->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m23->As<ast::type::MatrixType>()->rows(), 2u);
EXPECT_EQ(m23->As<ast::type::MatrixType>()->columns(), 3u);
auto* m24 = p->ConvertType(24);
EXPECT_TRUE(m24->IsMatrix());
EXPECT_TRUE(m24->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m24->AsMatrix()->rows(), 2u);
EXPECT_EQ(m24->AsMatrix()->columns(), 4u);
EXPECT_TRUE(m24->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m24->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m24->As<ast::type::MatrixType>()->rows(), 2u);
EXPECT_EQ(m24->As<ast::type::MatrixType>()->columns(), 4u);
auto* m32 = p->ConvertType(32);
EXPECT_TRUE(m32->IsMatrix());
EXPECT_TRUE(m32->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m32->AsMatrix()->rows(), 3u);
EXPECT_EQ(m32->AsMatrix()->columns(), 2u);
EXPECT_TRUE(m32->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m32->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m32->As<ast::type::MatrixType>()->rows(), 3u);
EXPECT_EQ(m32->As<ast::type::MatrixType>()->columns(), 2u);
auto* m33 = p->ConvertType(33);
EXPECT_TRUE(m33->IsMatrix());
EXPECT_TRUE(m33->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m33->AsMatrix()->rows(), 3u);
EXPECT_EQ(m33->AsMatrix()->columns(), 3u);
EXPECT_TRUE(m33->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m33->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m33->As<ast::type::MatrixType>()->rows(), 3u);
EXPECT_EQ(m33->As<ast::type::MatrixType>()->columns(), 3u);
auto* m34 = p->ConvertType(34);
EXPECT_TRUE(m34->IsMatrix());
EXPECT_TRUE(m34->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m34->AsMatrix()->rows(), 3u);
EXPECT_EQ(m34->AsMatrix()->columns(), 4u);
EXPECT_TRUE(m34->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m34->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m34->As<ast::type::MatrixType>()->rows(), 3u);
EXPECT_EQ(m34->As<ast::type::MatrixType>()->columns(), 4u);
auto* m42 = p->ConvertType(42);
EXPECT_TRUE(m42->IsMatrix());
EXPECT_TRUE(m42->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m42->AsMatrix()->rows(), 4u);
EXPECT_EQ(m42->AsMatrix()->columns(), 2u);
EXPECT_TRUE(m42->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m42->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m42->As<ast::type::MatrixType>()->rows(), 4u);
EXPECT_EQ(m42->As<ast::type::MatrixType>()->columns(), 2u);
auto* m43 = p->ConvertType(43);
EXPECT_TRUE(m43->IsMatrix());
EXPECT_TRUE(m43->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m43->AsMatrix()->rows(), 4u);
EXPECT_EQ(m43->AsMatrix()->columns(), 3u);
EXPECT_TRUE(m43->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m43->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m43->As<ast::type::MatrixType>()->rows(), 4u);
EXPECT_EQ(m43->As<ast::type::MatrixType>()->columns(), 3u);
auto* m44 = p->ConvertType(44);
EXPECT_TRUE(m44->IsMatrix());
EXPECT_TRUE(m44->AsMatrix()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m44->AsMatrix()->rows(), 4u);
EXPECT_EQ(m44->AsMatrix()->columns(), 4u);
EXPECT_TRUE(m44->Is<ast::type::MatrixType>());
EXPECT_TRUE(
m44->As<ast::type::MatrixType>()->type()->Is<ast::type::F32Type>());
EXPECT_EQ(m44->As<ast::type::MatrixType>()->rows(), 4u);
EXPECT_EQ(m44->As<ast::type::MatrixType>()->columns(), 4u);
EXPECT_TRUE(p->error().empty());
}

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

@@ -621,8 +621,8 @@ TEST_P(MatrixTest, Parse) {
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr) << p->error();
ASSERT_FALSE(p->has_error());
EXPECT_TRUE(t->IsMatrix());
auto* mat = t->AsMatrix();
EXPECT_TRUE(t->Is<ast::type::MatrixType>());
auto* mat = t->As<ast::type::MatrixType>();
EXPECT_EQ(mat->rows(), params.rows);
EXPECT_EQ(mat->columns(), params.columns);
}