Merge pull request #419 from steve-lunarg/lerp-fix

HLSL: add missing vec,vec,scalar form of lerp(), + test

Merge pull request #419 from steve-lunarg/lerp-fix
c21badf2 · John Kessenich · GitHub · 080fbe96 · cf57c044 · c21badf2
Commit c21badf2 authored Jul 28, 2016 by John Kessenich Committed by GitHub Jul 28, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

hlsl.intrinsics.frag.out Test/baseResults/hlsl.intrinsics.frag.out +0 -0

hlsl.intrinsics.frag Test/hlsl.intrinsics.frag +1 -0

hlslParseables.cpp hlsl/hlslParseables.cpp +2 -1

No files found.
--- a/Test/baseResults/hlsl.intrinsics.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.frag.out
--- a/Test/hlsl.intrinsics.frag
+++ b/Test/hlsl.intrinsics.frag
@@ -223,6 +223,7 @@ float3 PixelShaderFunction3(float3 inF0, float3 inF1, float3 inF2, uint3 inU0, u
    bool3 r041 = isnan(inF0);
    float3 r042 = ldexp(inF0, inF1);
    float3 r039a = lerp(inF0, inF1, inF2);
+    float3 r039b = lerp(inF0, inF1, 0.3); // test vec,vec,scalar lerp
    float r043 = length(inF0);
    float3 r044 = log(inF0);
    float3 r045 = log10(inF0);

--- a/hlsl/hlslParseables.cpp
+++ b/hlsl/hlslParseables.cpp
@@ -531,7 +531,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
        { "isnan",                            nullptr, "B" ,      "SVM",            "F",             EShLangAll },
        { "ldexp",                            nullptr, nullptr,   "SVM,",           "F,",            EShLangAll },
        { "length",                           "S",     "F",       "V",              "F",             EShLangAll },
-        { "lerp",                             nullptr, nullptr,   "SVM,,",          "F,,",           EShLangAll },
+        { "lerp",                             nullptr, nullptr,   "VM,,",           "F,,",           EShLangAll },
+        { "lerp",                             nullptr, nullptr,   "SVM,,S",         "F,,",           EShLangAll },
        { "lit",                              "V4",    "F",       "S,,",            "F,,",           EShLangAll },
        { "log",                              nullptr, nullptr,   "SVM",            "F",             EShLangAll },
        { "log10",                            nullptr, nullptr,   "SVM",            "F",             EShLangAll },