godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72494 from Chaosus/shader_fix_const_init 

Fix shader failure when using non-const initializer on a constant
This commit is contained in:
Rémi Verschelde 2023-02-02 21:05:27 +01:00
parent d1589a9492 e034d5f764
commit 9caf691c89
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
servers/rendering/shader_language.cpp
View File

@ -1225,7 +1225,7 @@ void ShaderLanguage::clear() {
char_idx = 0; char_idx = 0;
error_set = false; error_set = false;
error_str = ""; error_str = "";
last_const = false; is_const_decl = false;
while (nodes) { while (nodes) {
Node *n = nodes; Node *n = nodes;
nodes = nodes->next; nodes = nodes->next;
@ -3561,6 +3561,14 @@ bool ShaderLanguage::_parse_function_arguments(BlockNode *p_block, const Functio
return false; return false;
} }
if (is_const_decl && arg->type == Node::TYPE_VARIABLE) {
const VariableNode *var = static_cast<const VariableNode *>(arg);
if (!var->is_const) {
_set_error(RTR("Expected constant expression."));
return false;
}
}
p_func->arguments.push_back(arg); p_func->arguments.push_back(arg);
tk = _get_token(); tk = _get_token();
@ -5184,6 +5192,12 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
expr = func; expr = func;
} else { //a function call } else { //a function call
if (p_block == nullptr) { // Non-constructor function call in global space is forbidden.
if (is_const_decl) {
_set_error(RTR("Expected constant expression."));
}
return nullptr;
}
const StringName &name = identifier; const StringName &name = identifier;
@ -5460,6 +5474,10 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
_set_error(vformat(RTR("Unknown identifier in expression: '%s'."), String(identifier))); _set_error(vformat(RTR("Unknown identifier in expression: '%s'."), String(identifier)));
return nullptr; return nullptr;
} }
if (is_const_decl && !is_const) {
_set_error(RTR("Expected constant expression."));
return nullptr;
}
if (ident_type == IDENTIFIER_VARYING) { if (ident_type == IDENTIFIER_VARYING) {
TkPos prev_pos = _get_tkpos(); TkPos prev_pos = _get_tkpos();
Token next_token = _get_token(); Token next_token = _get_token();
@ -6977,6 +6995,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
} }
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
is_const_decl = is_const;
BlockNode::Variable var; BlockNode::Variable var;
var.type = type; var.type = type;
@ -7233,6 +7252,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
vdnode->declarations.push_back(decl); vdnode->declarations.push_back(decl);
p_block->variables[name] = var; p_block->variables[name] = var;
is_const_decl = false;
if (!fixed_array_size) { if (!fixed_array_size) {
array_size = 0; array_size = 0;
@ -9101,6 +9121,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
constant.precision = precision; constant.precision = precision;
constant.initializer = nullptr; constant.initializer = nullptr;
constant.array_size = array_size; constant.array_size = array_size;
is_const_decl = true;
if (tk.type == TK_BRACKET_OPEN) { if (tk.type == TK_BRACKET_OPEN) {
Error error = _parse_array_size(nullptr, constants, false, nullptr, &constant.array_size, &unknown_size); Error error = _parse_array_size(nullptr, constants, false, nullptr, &constant.array_size, &unknown_size);
@ -9360,6 +9381,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
unknown_size = false; unknown_size = false;
} else if (tk.type == TK_SEMICOLON) { } else if (tk.type == TK_SEMICOLON) {
is_const_decl = false;
break; break;
} else { } else {
_set_expected_error(",", ";"); _set_expected_error(",", ";");

2
servers/rendering/shader_language.h
View File

@ -953,7 +953,7 @@ private:
StringName shader_type_identifier; StringName shader_type_identifier;
StringName current_function; StringName current_function;
bool last_const = false; bool is_const_decl = false;
StringName last_name; StringName last_name;
bool is_shader_inc = false; bool is_shader_inc = false;