godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Fix shader crash when passing array to index expression

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-10-07 10:46:41 +03:00
parent 410cab4c61
commit e707391fb8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering/shader_language.cpp
View File

@@ -4626,8 +4626,8 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
return nullptr; return nullptr;
} }
if (index_expression->get_datatype() != TYPE_INT && index_expression->get_datatype() != TYPE_UINT) { if (index_expression->get_array_size() != 0 || (index_expression->get_datatype() != TYPE_INT && index_expression->get_datatype() != TYPE_UINT)) {
_set_error("Only integer expressions are allowed for indexing"); _set_error("Only integer expressions are allowed for indexing.");
return nullptr; return nullptr;
} }
@@ -5050,8 +5050,8 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
return nullptr; return nullptr;
} }
if (index_expression->get_datatype() != TYPE_INT && index_expression->get_datatype() != TYPE_UINT) { if (index_expression->get_array_size() != 0 || (index_expression->get_datatype() != TYPE_INT && index_expression->get_datatype() != TYPE_UINT)) {
_set_error("Only integer expressions are allowed for indexing"); _set_error("Only integer expressions are allowed for indexing.");
return nullptr; return nullptr;
} }
@@ -5096,8 +5096,8 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
return nullptr; return nullptr;
} }
if (index->get_datatype() != TYPE_INT && index->get_datatype() != TYPE_UINT) { if (index->get_array_size() != 0 || (index->get_datatype() != TYPE_INT && index->get_datatype() != TYPE_UINT)) {
_set_error("Only integer datatypes are allowed for indexing"); _set_error("Only integer expressions are allowed for indexing.");
return nullptr; return nullptr;
} }