maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #19299 from oliverrausch/master

Browse source 
Fix return type of isnan and isinf in the shader language
This commit is contained in:
Rémi Verschelde 2018-06-01 09:20:04 +02:00 committed by GitHub
parent 255d6470ee 2368b31e1e
commit 1820f9752d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/visual/shader_language.cpp
View file

@ -1625,14 +1625,14 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
{ "smoothstep", TYPE_VEC4, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VEC4, TYPE_VOID } },
{ "isnan", TYPE_BOOL, { TYPE_FLOAT, TYPE_VOID } },
{ "isnan", TYPE_BOOL, { TYPE_VEC2, TYPE_VOID } },
{ "isnan", TYPE_BOOL, { TYPE_VEC3, TYPE_VOID } },
{ "isnan", TYPE_BOOL, { TYPE_VEC4, TYPE_VOID } },
{ "isnan", TYPE_BVEC2, { TYPE_VEC2, TYPE_VOID } },
{ "isnan", TYPE_BVEC3, { TYPE_VEC3, TYPE_VOID } },
{ "isnan", TYPE_BVEC4, { TYPE_VEC4, TYPE_VOID } },
{ "isinf", TYPE_BOOL, { TYPE_FLOAT, TYPE_VOID } },
{ "isinf", TYPE_BOOL, { TYPE_VEC2, TYPE_VOID } },
{ "isinf", TYPE_BOOL, { TYPE_VEC3, TYPE_VOID } },
{ "isinf", TYPE_BOOL, { TYPE_VEC4, TYPE_VOID } },
{ "isinf", TYPE_BVEC2, { TYPE_VEC2, TYPE_VOID } },
{ "isinf", TYPE_BVEC3, { TYPE_VEC3, TYPE_VOID } },
{ "isinf", TYPE_BVEC4, { TYPE_VEC4, TYPE_VOID } },
{ "floatBitsToInt", TYPE_INT, { TYPE_FLOAT, TYPE_VOID } },
{ "floatBitsToInt", TYPE_IVEC2, { TYPE_VEC2, TYPE_VOID } },