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

spirv-reader: Support NClamp, NMin, NMax 

Also map FClamp, FMin, FMax to WGSL "clamp", "min", and "max".
The behaviour of FClamp, FMin, and FMax doesn't specify
much when operands are NaN.  Map to WGSL functions
which are more prescriptive about results when operands are NaN.

Also add TODOs for the GLSL.std.450 instructions that I had
missed earlier: the interpolate-at instructions

Change-Id: I48503be68128d2a0659bef7057e890cb9c0617ad
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35080
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Auto-Submit: David Neto <dneto@google.com>
This commit is contained in:
David Neto 2020-12-07 23:45:47 +00:00 committed by Commit Bot service account
parent 8b0ffe9185
commit eb7865cd0d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/reader/spirv/function.cc
View File

@ -337,10 +337,18 @@ std::string GetGlslStd450FuncName(uint32_t ext_opcode) {
return "normalize"; return "normalize";
case GLSLstd450UClamp: case GLSLstd450UClamp:
case GLSLstd450SClamp: case GLSLstd450SClamp:
case GLSLstd450FClamp: case GLSLstd450NClamp:
case GLSLstd450FClamp: // FClamp is less prescriptive about NaN operands
return "clamp"; return "clamp";
case GLSLstd450Length: case GLSLstd450Length:
return "length"; return "length";
case GLSLstd450NMin:
case GLSLstd450FMin: // FMin is less prescriptive about NaN operands
return "min";
case GLSLstd450NMax:
case GLSLstd450FMax: // FMax is less prescriptive about NaN operands
return "max";
default: default:
// TODO(dneto). The following are not implemented. // TODO(dneto). The following are not implemented.
// They are grouped semantically, as in GLSL.std.450.h. // They are grouped semantically, as in GLSL.std.450.h.
@ -381,10 +389,8 @@ std::string GetGlslStd450FuncName(uint32_t ext_opcode) {
case GLSLstd450Modf: case GLSLstd450Modf:
case GLSLstd450ModfStruct: case GLSLstd450ModfStruct:
case GLSLstd450FMin:
case GLSLstd450UMin: case GLSLstd450UMin:
case GLSLstd450SMin: case GLSLstd450SMin:
case GLSLstd450FMax:
case GLSLstd450UMax: case GLSLstd450UMax:
case GLSLstd450SMax: case GLSLstd450SMax:
case GLSLstd450FMix: case GLSLstd450FMix:
@ -418,6 +424,10 @@ std::string GetGlslStd450FuncName(uint32_t ext_opcode) {
case GLSLstd450FindILsb: case GLSLstd450FindILsb:
case GLSLstd450FindSMsb: case GLSLstd450FindSMsb:
case GLSLstd450FindUMsb: case GLSLstd450FindUMsb:
case GLSLstd450InterpolateAtCentroid:
case GLSLstd450InterpolateAtSample:
case GLSLstd450InterpolateAtOffset:
break; break;
} }
return ""; return "";

13
src/reader/spirv/function_glsl_std_450_test.cc
View File

@ -467,12 +467,21 @@ INSTANTIATE_TEST_SUITE_P(Samples,
INSTANTIATE_TEST_SUITE_P(Samples, INSTANTIATE_TEST_SUITE_P(Samples,
SpvParserTest_GlslStd450_Floating_FloatingFloating, SpvParserTest_GlslStd450_Floating_FloatingFloating,
::testing::Values(GlslStd450Case{"Atan2", "atan2"})); ::testing::ValuesIn(std::vector<GlslStd450Case>{
{"Atan2", "atan2"},
{"NMax", "max"},
{"NMin", "min"},
{"FMax", "max"}, // WGSL max promises more for NaN
{"FMin", "min"} // WGSL min promises more for NaN
}));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
Samples, Samples,
SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating, SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating,
::testing::Values(GlslStd450Case{"FClamp", "clamp"})); ::testing::ValuesIn(std::vector<GlslStd450Case>{
{"NClamp", "clamp"},
{"FClamp", "clamp"} // WGSL FClamp promises more for NaN
}));
TEST_P(SpvParserTest_GlslStd450_Inting_IntingIntingInting, Scalar) { TEST_P(SpvParserTest_GlslStd450_Inting_IntingIntingInting, Scalar) {
const auto assembly = Preamble() + R"( const auto assembly = Preamble() + R"(