summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorKevin Rogovin <kevin.rogovin@intel.com>2013-12-09 10:38:35 +0200
committerCarl Worth <cworth@cworth.org>2014-01-02 15:57:40 -0800
commitec80a279a5f79b45b773e9e46e7b6fa7159a4049 (patch)
treeab320eb2aaf90e8b69c6e1b2b4aace298c535f51 /src/glsl
parentf6ea5b7bd764b5dfb6513445dd26a76b07ea48e6 (diff)
Use line number information from entire function expression
This patch changes the error reporting behavior for incorrect function invocation (triggered by match_function_by_name() unable to find a matching function call) from using the line number information associated to the function name term to using the line number information of the entire function expression. Fixes bug #72264. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72264 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 23d294bb60be41e3876179e7b763a275902d1efd)
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/ast_function.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 2707522ef54..cb199cf528c 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -1651,7 +1651,7 @@ ast_function_expression::hir(exec_list *instructions,
} else {
const ast_expression *id = subexpressions[0];
const char *func_name = id->primary_expression.identifier;
- YYLTYPE loc = id->get_location();
+ YYLTYPE loc = get_location();
exec_list actual_parameters;
process_parameters(instructions, &actual_parameters, &this->expressions,