godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix return type of isnan and isinf in the shader language 

(cherry picked from commit 2368b31e1e)
This commit is contained in:
Oliver Rausch 2018-06-01 01:34:32 +02:00 committed by Rémi Verschelde
parent 82e54db588
commit 2107517f2f
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

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