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

Fix few redefinition name errors for variable/param/function in shaders

Browse Source
This commit is contained in:
Yuri Roubinsky 2019-10-06 17:24:30 +03:00
parent 1d9233c388
commit 5a5a062d61
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/visual/shader_language.cpp
View File

@ -3842,9 +3842,12 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
} }
StringName name = tk.text; StringName name = tk.text;
if (_find_identifier(p_block, p_builtin_types, name)) { ShaderLanguage::IdentifierType itype;
_set_error("Redefinition of '" + String(name) + "'"); if (_find_identifier(p_block, p_builtin_types, name, (ShaderLanguage::DataType *)0, &itype)) {
return ERR_PARSE_ERROR; if (itype != IDENTIFIER_FUNCTION) {
_set_error("Redefinition of '" + String(name) + "'");
return ERR_PARSE_ERROR;
}
} }
BlockNode::Variable var; BlockNode::Variable var;
@ -5121,9 +5124,12 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
pname = tk.text; pname = tk.text;
if (_find_identifier(func_node->body, builtin_types, pname)) { ShaderLanguage::IdentifierType itype;
_set_error("Redefinition of '" + String(pname) + "'"); if (_find_identifier(func_node->body, builtin_types, pname, (ShaderLanguage::DataType *)0, &itype)) {
return ERR_PARSE_ERROR; if (itype != IDENTIFIER_FUNCTION) {
_set_error("Redefinition of '" + String(pname) + "'");
return ERR_PARSE_ERROR;
}
} }
FunctionNode::Argument arg; FunctionNode::Argument arg;
arg.type = ptype; arg.type = ptype;