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

Merge pull request #33175 from Chaosus/shader_fix_builtin_crashes

Browse source 
Prevents shader crash on GLES2 if unsupported built-in has been used
This commit is contained in:
Rémi Verschelde 2019-11-01 17:36:37 +01:00 committed by GitHub
parent d7e7b8365d 1b003f3d64
commit 36a785513f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 608 additions and 608 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1213
servers/visual/shader_language.cpp
View file

File diff suppressed because it is too large Load diff

3
servers/visual/shader_language.h
View file

@ -715,7 +715,7 @@ private:
enum SubClassTag {
TAG_GLOBAL,
TAG_ARRAY
TAG_ARRAY,
};
struct BuiltinFuncDef {
@ -724,6 +724,7 @@ private:
DataType rettype;
const DataType args[MAX_ARGS];
SubClassTag tag;
bool high_end;
};
struct BuiltinFuncOutArgs { //arguments used as out in built in functions