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

Merge pull request #79459 from MoltenCoffee/fix-shader-arguments-error

Browse Source 
Add error for undefined function in shader
This commit is contained in:
Yuri Sizov 2023-07-24 19:32:46 +02:00
commit 372e9abcfc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/shader_language.cpp
View File

@ -3388,12 +3388,14 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
} }
int last_arg_count = 0; int last_arg_count = 0;
bool exists = false;
String arg_list = ""; String arg_list = "";
for (int i = 0; i < shader->functions.size(); i++) { for (int i = 0; i < shader->functions.size(); i++) {
if (name != shader->functions[i].name) { if (name != shader->functions[i].name) {
continue; continue;
} }
exists = true;
if (!shader->functions[i].callable) { if (!shader->functions[i].callable) {
_set_error(vformat(RTR("Function '%s' can't be called from source code."), String(name))); _set_error(vformat(RTR("Function '%s' can't be called from source code."), String(name)));
@ -3494,11 +3496,13 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
} }
} }
if (exists) {
if (last_arg_count > args.size()) { if (last_arg_count > args.size()) {
_set_error(vformat(RTR("Too few arguments for \"%s(%s)\" call. Expected at least %d but received %d."), String(name), arg_list, last_arg_count, args.size())); _set_error(vformat(RTR("Too few arguments for \"%s(%s)\" call. Expected at least %d but received %d."), String(name), arg_list, last_arg_count, args.size()));
} else if (last_arg_count < args.size()) { } else if (last_arg_count < args.size()) {
_set_error(vformat(RTR("Too many arguments for \"%s(%s)\" call. Expected at most %d but received %d."), String(name), arg_list, last_arg_count, args.size())); _set_error(vformat(RTR("Too many arguments for \"%s(%s)\" call. Expected at most %d but received %d."), String(name), arg_list, last_arg_count, args.size()));
} }
}
return false; return false;
} }