瀏覽代碼

Merge pull request #33175 from Chaosus/shader_fix_builtin_crashes

Prevents shader crash on GLES2 if unsupported built-in has been used
Rémi Verschelde 6 年之前
父節點
當前提交
36a785513f
共有 2 個文件被更改,包括 677 次插入693 次删除
  1. 675 692
      servers/visual/shader_language.cpp
  2. 2 1
      servers/visual/shader_language.h

文件差異過大導致無法顯示
+ 675 - 692
servers/visual/shader_language.cpp


+ 2 - 1
servers/visual/shader_language.h

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

部分文件因文件數量過多而無法顯示