encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add GLSL RoundEven support 

This CL adds support for the GLSL RoundEven command in type
determination.

Bug: tint:5
Change-Id: I956ea9532785a42fe51a24b5121ce47cfbc78242
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19940
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
dan sinclair 2020-04-20 15:47:55 +00:00 committed by dan sinclair
parent fd5d4ca16c
commit ca1723e990
2 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/type_determiner.cc
View File

@ -576,19 +576,23 @@ ast::type::Type* TypeDeterminer::GetImportData(
return nullptr; return nullptr;
} }
if (name == "round") { if (name == "round" || name == "roundeven") {
if (params.size() != 1) { if (params.size() != 1) {
error_ = "incorrect number of parameters for round. Expected 1 got " + error_ = "incorrect number of parameters for " + name +
std::to_string(params.size()); ". Expected 1 got " + std::to_string(params.size());
return nullptr; return nullptr;
} }
if (!params[0]->result_type()->is_float_scalar_or_vector()) { if (!params[0]->result_type()->is_float_scalar_or_vector()) {
error_ = error_ = "incorrect type for " + name +
"incorrect type for round. Requires a float scalar or a float vector"; ". Requires a float scalar or a float vector";
return nullptr; return nullptr;
} }
*id = GLSLstd450Round; if (name == "round") {
*id = GLSLstd450Round;
} else if (name == "roundeven") {
*id = GLSLstd450RoundEven;
}
return params[0]->result_type(); return params[0]->result_type();
} }

63
src/type_determiner_test.cc
View File

@ -1479,7 +1479,19 @@ TEST_F(TypeDeterminerTest, StorageClass_NonFunctionClassError) {
"function variable has a non-function storage class"); "function variable has a non-function storage class");
} }
TEST_F(TypeDeterminerTest, ImportData_Round_Scalar) { struct GLSLData {
const char* name;
uint32_t value;
};
inline std::ostream& operator<<(std::ostream& out, GLSLData data) {
out << data.name;
return out;
}
using ImportData_FloatTest = TypeDeterminerTestWithParam<GLSLData>;
TEST_P(ImportData_FloatTest, Scalar) {
auto param = GetParam();
ast::type::F32Type f32; ast::type::F32Type f32;
ast::ExpressionList params; ast::ExpressionList params;
@ -1489,13 +1501,15 @@ TEST_F(TypeDeterminerTest, ImportData_Round_Scalar) {
ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error(); ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error();
uint32_t id = 0; uint32_t id = 0;
auto* type = td()->GetImportData("GLSL.std.450", "round", params, &id); auto* type = td()->GetImportData("GLSL.std.450", param.name, params, &id);
ASSERT_NE(type, nullptr); ASSERT_NE(type, nullptr);
EXPECT_TRUE(type->is_float_scalar()); EXPECT_TRUE(type->is_float_scalar());
EXPECT_EQ(id, GLSLstd450Round); EXPECT_EQ(id, param.value);
} }
TEST_F(TypeDeterminerTest, ImportData_Round_Vector) { TEST_P(ImportData_FloatTest, Vector) {
auto param = GetParam();
ast::type::F32Type f32; ast::type::F32Type f32;
ast::type::VectorType vec(&f32, 3); ast::type::VectorType vec(&f32, 3);
@ -1514,14 +1528,16 @@ TEST_F(TypeDeterminerTest, ImportData_Round_Vector) {
ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error(); ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error();
uint32_t id = 0; uint32_t id = 0;
auto* type = td()->GetImportData("GLSL.std.450", "round", params, &id); auto* type = td()->GetImportData("GLSL.std.450", param.name, params, &id);
ASSERT_NE(type, nullptr); ASSERT_NE(type, nullptr);
EXPECT_TRUE(type->is_float_vector()); EXPECT_TRUE(type->is_float_vector());
EXPECT_EQ(type->AsVector()->size(), 3); EXPECT_EQ(type->AsVector()->size(), 3);
EXPECT_EQ(id, GLSLstd450Round); EXPECT_EQ(id, param.value);
} }
TEST_F(TypeDeterminerTest, ImportData_Round_Error_Integer) { TEST_P(ImportData_FloatTest, Error_Integer) {
auto param = GetParam();
ast::type::I32Type i32; ast::type::I32Type i32;
ast::ExpressionList params; ast::ExpressionList params;
@ -1531,23 +1547,26 @@ TEST_F(TypeDeterminerTest, ImportData_Round_Error_Integer) {
ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error(); ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error();
uint32_t id = 0; uint32_t id = 0;
auto* type = td()->GetImportData("GLSL.std.450", "round", params, &id); auto* type = td()->GetImportData("GLSL.std.450", param.name, params, &id);
ASSERT_EQ(type, nullptr); ASSERT_EQ(type, nullptr);
EXPECT_EQ( EXPECT_EQ(td()->error(), std::string("incorrect type for ") + param.name +
td()->error(), ". Requires a float scalar or a float vector");
"incorrect type for round. Requires a float scalar or a float vector");
} }
TEST_F(TypeDeterminerTest, ImportData_Round_Error_NoParams) { TEST_P(ImportData_FloatTest, Error_NoParams) {
auto param = GetParam();
ast::ExpressionList params; ast::ExpressionList params;
uint32_t id = 0; uint32_t id = 0;
auto* type = td()->GetImportData("GLSL.std.450", "round", params, &id); auto* type = td()->GetImportData("GLSL.std.450", param.name, params, &id);
ASSERT_EQ(type, nullptr); ASSERT_EQ(type, nullptr);
EXPECT_EQ(td()->error(), EXPECT_EQ(td()->error(), std::string("incorrect number of parameters for ") +
"incorrect number of parameters for round. Expected 1 got 0"); param.name + ". Expected 1 got 0");
} }
TEST_F(TypeDeterminerTest, ImportData_Round_Error_MultipleParams) { TEST_P(ImportData_FloatTest, Error_MultipleParams) {
auto param = GetParam();
ast::type::F32Type f32; ast::type::F32Type f32;
ast::ExpressionList params; ast::ExpressionList params;
params.push_back(std::make_unique<ast::ScalarConstructorExpression>( params.push_back(std::make_unique<ast::ScalarConstructorExpression>(
@ -1560,11 +1579,17 @@ TEST_F(TypeDeterminerTest, ImportData_Round_Error_MultipleParams) {
ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error(); ASSERT_TRUE(td()->DetermineResultType(params)) << td()->error();
uint32_t id = 0; uint32_t id = 0;
auto* type = td()->GetImportData("GLSL.std.450", "round", params, &id); auto* type = td()->GetImportData("GLSL.std.450", param.name, params, &id);
ASSERT_EQ(type, nullptr); ASSERT_EQ(type, nullptr);
EXPECT_EQ(td()->error(), EXPECT_EQ(td()->error(), std::string("incorrect number of parameters for ") +
"incorrect number of parameters for round. Expected 1 got 3"); param.name + ". Expected 1 got 3");
} }
INSTANTIATE_TEST_SUITE_P(TypeDeterminerTest,
ImportData_FloatTest,
testing::Values(GLSLData{"round", GLSLstd450Round},
GLSLData{"roundeven",
GLSLstd450RoundEven}));
} // namespace } // namespace
} // namespace tint } // namespace tint