diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-16 12:54:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 12:54:06 +0100 |
| commit | e329cd60052f2dbfcca5bf2750672a3c2ca9dfa5 (patch) | |
| tree | 6dad989cd61c33dac1772851a58bd333e9f9d111 /servers/visual/shader_language.cpp | |
| parent | fc2550c4c8e9ca4ee7378af0330544695d04d6c8 (diff) | |
| parent | 5098232ee695ceca8d8e4536ac7cb142b0805abb (diff) | |
Merge pull request #35189 from Chaosus/disable_gles2_array_init
Disabled array initialization, const array and arr.length in GLES2 shaders
Diffstat (limited to 'servers/visual/shader_language.cpp')
| -rw-r--r-- | servers/visual/shader_language.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 225b382524..2b61d72f6a 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2060,7 +2060,7 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = { //sub-functions //array - { "length", TYPE_INT, { TYPE_VOID }, TAG_ARRAY, false }, + { "length", TYPE_INT, { TYPE_VOID }, TAG_ARRAY, true }, { NULL, TYPE_VOID, { TYPE_VOID }, TAG_GLOBAL, false } @@ -3888,6 +3888,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui if (tk.type == TK_BRACKET_OPEN) { bool unknown_size = false; + if (VisualServer::get_singleton()->is_low_end() && is_const) { + _set_error("Local const arrays are supported only on high-end platform!"); + return ERR_PARSE_ERROR; + } + ArrayDeclarationNode *node = alloc_node<ArrayDeclarationNode>(); node->datatype = type; node->precision = precision; @@ -3923,6 +3928,12 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui tk = _get_token(); if (tk.type == TK_OP_ASSIGN) { + + if (VisualServer::get_singleton()->is_low_end()) { + _set_error("Array initialization is supported only on high-end platform!"); + return ERR_PARSE_ERROR; + } + tk = _get_token(); if (tk.type != TK_CURLY_BRACKET_OPEN) { |