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

GLSL: fix "mix" intrinsic. 

GLSL's mix is "mix", not "lerp".

Bug: tint:1297
Change-Id: Ie1894d28a35385511fcb5e3474856af82a6cc763
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/69281
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Stephen White 2021-11-15 13:35:48 +00:00 committed by Tint LUCI CQ
parent e1761d5852
commit 6d643deefa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/writer/glsl/generator_impl.cc
View File

@ -1339,7 +1339,7 @@ std::string GeneratorImpl::generate_builtin_name(
case sem::IntrinsicType::kIsNan: case sem::IntrinsicType::kIsNan:
return "isnan"; return "isnan";
case sem::IntrinsicType::kMix: case sem::IntrinsicType::kMix:
return "lerp"; return "mix";
case sem::IntrinsicType::kReverseBits: case sem::IntrinsicType::kReverseBits:
return "reversebits"; return "reversebits";
case sem::IntrinsicType::kSmoothStep: case sem::IntrinsicType::kSmoothStep:

2
src/writer/glsl/generator_impl_import_test.cc
View File

@ -212,7 +212,7 @@ TEST_P(GlslImportData_TripleParam_ScalarTest, Float) {
INSTANTIATE_TEST_SUITE_P(GlslGeneratorImplTest_Import, INSTANTIATE_TEST_SUITE_P(GlslGeneratorImplTest_Import,
GlslImportData_TripleParam_ScalarTest, GlslImportData_TripleParam_ScalarTest,
testing::Values(GlslImportData{"fma", "mad"}, testing::Values(GlslImportData{"fma", "mad"},
GlslImportData{"mix", "lerp"}, GlslImportData{"mix", "mix"},
GlslImportData{"clamp", "clamp"}, GlslImportData{"clamp", "clamp"},
GlslImportData{"smoothStep", GlslImportData{"smoothStep",
"smoothstep"})); "smoothstep"}));

2
src/writer/glsl/generator_impl_intrinsic_test.cc
View File

@ -235,7 +235,7 @@ INSTANTIATE_TEST_SUITE_P(
IntrinsicData{IntrinsicType::kMax, ParamType::kU32, "max"}, IntrinsicData{IntrinsicType::kMax, ParamType::kU32, "max"},
IntrinsicData{IntrinsicType::kMin, ParamType::kF32, "min"}, IntrinsicData{IntrinsicType::kMin, ParamType::kF32, "min"},
IntrinsicData{IntrinsicType::kMin, ParamType::kU32, "min"}, IntrinsicData{IntrinsicType::kMin, ParamType::kU32, "min"},
IntrinsicData{IntrinsicType::kMix, ParamType::kF32, "lerp"}, IntrinsicData{IntrinsicType::kMix, ParamType::kF32, "mix"},
IntrinsicData{IntrinsicType::kNormalize, ParamType::kF32, "normalize"}, IntrinsicData{IntrinsicType::kNormalize, ParamType::kF32, "normalize"},
IntrinsicData{IntrinsicType::kPow, ParamType::kF32, "pow"}, IntrinsicData{IntrinsicType::kPow, ParamType::kF32, "pow"},
IntrinsicData{IntrinsicType::kReflect, ParamType::kF32, "reflect"}, IntrinsicData{IntrinsicType::kReflect, ParamType::kF32, "reflect"},