godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects 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
commit a7b1d85828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats 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) { if (!call_expression) {
return nullptr; return nullptr;
} }
data_type = call_expression->get_datatype();
} else if (tk.type == TK_BRACKET_OPEN) { // indexing } else if (tk.type == TK_BRACKET_OPEN) { // indexing
index_expression = _parse_and_reduce_expression(p_block, p_function_info); index_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (!index_expression) { if (!index_expression) {
@ -5598,15 +5597,13 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (p_block != nullptr) { 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); mn->call_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (p_block != nullptr) { if (p_block != nullptr) {
p_block->block_tag = SubClassTag::TAG_GLOBAL; p_block->block_tag = SubClassTag::TAG_GLOBAL;
} }
if (!call_expression) { if (!mn->call_expression) {
return nullptr; return nullptr;
} }
mn->datatype = call_expression->get_datatype();
mn->call_expression = call_expression;
} else if (tk.type == TK_BRACKET_OPEN) { } else if (tk.type == TK_BRACKET_OPEN) {
Node *index_expression = _parse_and_reduce_expression(p_block, p_function_info); Node *index_expression = _parse_and_reduce_expression(p_block, p_function_info);
if (!index_expression) { if (!index_expression) {

8
servers/rendering/shader_language.h
View File

@ -451,8 +451,8 @@ public:
int array_size = 0; int array_size = 0;
bool is_local = false; bool is_local = false;
virtual DataType get_datatype() const override { return datatype_cache; } virtual DataType get_datatype() const override { return call_expression ? call_expression->get_datatype() : datatype_cache; }
virtual String get_datatype_name() const override { return String(struct_name); } virtual String get_datatype_name() const override { return call_expression ? call_expression->get_datatype_name() : String(struct_name); }
virtual int get_array_size() const override { return (index_expression || call_expression) ? 0 : array_size; } virtual int get_array_size() const override { return (index_expression || call_expression) ? 0 : array_size; }
virtual bool is_indexed() const override { return index_expression != nullptr; } virtual bool is_indexed() const override { return index_expression != nullptr; }
@ -558,8 +558,8 @@ public:
Node *call_expression = nullptr; Node *call_expression = nullptr;
bool has_swizzling_duplicates = false; bool has_swizzling_duplicates = false;
virtual DataType get_datatype() const override { return datatype; } virtual DataType get_datatype() const override { return call_expression ? call_expression->get_datatype() : datatype; }
virtual String get_datatype_name() const override { return String(struct_name); } virtual String get_datatype_name() const override { return call_expression ? call_expression->get_datatype_name() : String(struct_name); }
virtual int get_array_size() const override { return (index_expression || call_expression) ? 0 : array_size; } virtual int get_array_size() const override { return (index_expression || call_expression) ? 0 : array_size; }
virtual bool is_indexed() const override { return index_expression != nullptr || call_expression != nullptr; } virtual bool is_indexed() const override { return index_expression != nullptr || call_expression != nullptr; }