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 Radians and Degrees methods. 

This CL adds support to the type determiner for the GLSL Radians and
Degrees methods. We use the general float calls for this because we only
support FP32 and have plans for FP16. Other floating point sizes are not
supported but we have no support for them..

Bug: tint:5
Change-Id: I38f0551ce5f9ed7dd31496f13880697cd1f21ba4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19947
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
dan sinclair 2020-04-20 15:49:33 +00:00 committed by dan sinclair
parent 7b55da5f80
commit b90a56fb66
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/type_determiner.cc
View File

@ -576,9 +576,15 @@ ast::type::Type* TypeDeterminer::GetImportData(
return nullptr; return nullptr;
} }
// Most of these are floating-point general except the below which are only
// FP16 and FP32. We only have FP32 at this point so the below works, if we
// get FP64 support or otherwise we'll need to differentiate.
// * radians
// * degrees
if (name == "round" || name == "roundeven" || name == "trunc" || if (name == "round" || name == "roundeven" || name == "trunc" ||
name == "fabs" || name == "fsign" || name == "floor" || name == "ceil" || name == "fabs" || name == "fsign" || name == "floor" || name == "ceil" ||
name == "fract") { name == "fract" || name == "radians" || name == "degrees") {
if (params.size() != 1) { if (params.size() != 1) {
error_ = "incorrect number of parameters for " + name + error_ = "incorrect number of parameters for " + name +
". Expected 1 got " + std::to_string(params.size()); ". Expected 1 got " + std::to_string(params.size());
@ -606,6 +612,10 @@ ast::type::Type* TypeDeterminer::GetImportData(
*id = GLSLstd450Ceil; *id = GLSLstd450Ceil;
} else if (name == "fract") { } else if (name == "fract") {
*id = GLSLstd450Fract; *id = GLSLstd450Fract;
} else if (name == "radians") {
*id = GLSLstd450Radians;
} else if (name == "degrees") {
*id = GLSLstd450Degrees;
} }
return params[0]->result_type(); return params[0]->result_type();

24
src/type_determiner_test.cc
View File

@ -1585,17 +1585,19 @@ TEST_P(ImportData_FloatTest, Error_MultipleParams) {
param.name + ". Expected 1 got 3"); param.name + ". Expected 1 got 3");
} }
INSTANTIATE_TEST_SUITE_P(TypeDeterminerTest, INSTANTIATE_TEST_SUITE_P(
ImportData_FloatTest, TypeDeterminerTest,
testing::Values(GLSLData{"round", GLSLstd450Round}, ImportData_FloatTest,
GLSLData{"roundeven", testing::Values(GLSLData{"round", GLSLstd450Round},
GLSLstd450RoundEven}, GLSLData{"roundeven", GLSLstd450RoundEven},
GLSLData{"trunc", GLSLstd450Trunc}, GLSLData{"trunc", GLSLstd450Trunc},
GLSLData{"fabs", GLSLstd450FAbs}, GLSLData{"fabs", GLSLstd450FAbs},
GLSLData{"fsign", GLSLstd450FSign}, GLSLData{"fsign", GLSLstd450FSign},
GLSLData{"floor", GLSLstd450Floor}, GLSLData{"floor", GLSLstd450Floor},
GLSLData{"ceil", GLSLstd450Ceil}, GLSLData{"ceil", GLSLstd450Ceil},
GLSLData{"fract", GLSLstd450Fract})); GLSLData{"fract", GLSLstd450Fract},
GLSLData{"radians", GLSLstd450Radians},
GLSLData{"degrees", GLSLstd450Degrees}));
} // namespace } // namespace
} // namespace tint } // namespace tint