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

Fix shader crashing when attempting to access length() at global space

Browse Source
This commit is contained in:
Yuri Roubinsky
2022-04-01 08:39:29 +03:00
parent 340ad7d748
commit d47035a6fb
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering/shader_language.cpp
View File

@@ -5134,9 +5134,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
} }
} else if (tk.type == TK_PERIOD) { } else if (tk.type == TK_PERIOD) {
completion_class = TAG_ARRAY; completion_class = TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY; p_block->block_tag = SubClassTag::TAG_ARRAY;
}
call_expression = _parse_and_reduce_expression(p_block, p_function_info); call_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL; p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) { if (!call_expression) {
return nullptr; return nullptr;
} }
@@ -5287,9 +5291,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (!expr->is_indexed() && expr->get_array_size() > 0) { if (!expr->is_indexed() && expr->get_array_size() > 0) {
completion_class = TAG_ARRAY; completion_class = TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY; p_block->block_tag = SubClassTag::TAG_ARRAY;
}
Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info); Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL; p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) { if (!call_expression) {
return nullptr; return nullptr;
} }
@@ -5587,9 +5595,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
mn->assign_expression = assign_expression; mn->assign_expression = assign_expression;
} else if (tk.type == TK_PERIOD) { } else if (tk.type == TK_PERIOD) {
completion_class = TAG_ARRAY; completion_class = TAG_ARRAY;
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_ARRAY; p_block->block_tag = SubClassTag::TAG_ARRAY;
}
Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info); Node *call_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL; p_block->block_tag = SubClassTag::TAG_GLOBAL;
}
if (!call_expression) { if (!call_expression) {
return nullptr; return nullptr;
} }