AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report that no function found if signature lookup is empty

Browse Source 
If no function signature is found for a function name, report that the
function is not found instead of printing an empty list of candidates.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kevin Rogovin
2013-12-09 11:18:26 +02:00
committed by Ian Romanick
parent 23d294bb60
commit 3b1195f8a6
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/glsl/ast_function.cpp
View File

@@ -450,17 +450,24 @@ no_matching_function_error(const char *name,
exec_list *actual_parameters,
_mesa_glsl_parse_state *state)
{
char *str = prototype_string(NULL, name, actual_parameters);
_mesa_glsl_error(loc, state,
"no matching function for call to `%s'; candidates are:",
str);
ralloc_free(str);
gl_shader *sh = _mesa_glsl_get_builtin_function_shader();
print_function_prototypes(state, loc, state->symbols->get_function(name));
if (state->symbols->get_function(name) == NULL
&& (!state->uses_builtin_functions
|| sh->symbols->get_function(name) == NULL)) {
_mesa_glsl_error(loc, state, "no function with name '%s'", name);
} else {
char *str = prototype_string(NULL, name, actual_parameters);
_mesa_glsl_error(loc, state,
"no matching function for call to `%s'; candidates are:",
str);
ralloc_free(str);
if (state->uses_builtin_functions) {
gl_shader *sh = _mesa_glsl_get_builtin_function_shader();
print_function_prototypes(state, loc, sh->symbols->get_function(name));
print_function_prototypes(state, loc, state->symbols->get_function(name));
if (state->uses_builtin_functions) {
print_function_prototypes(state, loc, sh->symbols->get_function(name));
}
}
}