mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
HLSL: add missing vec,vec,scalar form of lerp(), + test
This commit is contained in:
John Kessenich
2016-07-28 16:56:25 -06:00
committed by GitHub
parent 080fbe9615 cf57c04401
commit c21badf2a1
3 changed files with 4554 additions and 4528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hlsl/hlslParseables.cpp
View File

@@ -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 },