godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #59825 from Chaosus/shader_fix

Browse Source 
Fix incorrect parsing array's `length()` at return statement in shader
This commit is contained in:
Rémi Verschelde
2022-04-12 12:40:54 +02:00
committed by GitHub
parent 788f355ad2 0864c9abaa
commit a7b1d85828
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
servers/rendering/shader_language.cpp
View File

@@ -5144,7 +5144,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (!call_expression) {
return nullptr;
}
data_type = call_expression->get_datatype();
} else if (tk.type == TK_BRACKET_OPEN) { // indexing
index_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (!index_expression) {
@@ -5598,15 +5597,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY;
}
Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info);
mn->call_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) {
if (!mn->call_expression) {
return nullptr;
}
mn->datatype = call_expression->get_datatype();
mn->call_expression = call_expression;
} else if (tk.type == TK_BRACKET_OPEN) {
Node *index_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (!index_expression) {