summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-08-25 09:43:41 -0700
committerDave Airlie <airlied@redhat.com>2011-08-25 21:07:42 +0100
commitc25b4943322ddd31d70d87464fe32be26ac6c858 (patch)
treeb113b7e49a6dcfc7cb86c9e795208377dcf9738d
parent27395cb5b688d3d255d11c4d766a2699fd1c67d4 (diff)
glsl: Bail after reporting an error for non-constant const_in parameters.
Otherwise we continue and hit the "Illegal formal parameter mode" assertion. Fixes negative compile test texelFetchOffset.frag in piglit. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/glsl/ast_function.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index c49a33d048..8b79d85058 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -164,6 +164,7 @@ match_function_by_name(exec_list *instructions, const char *name,
_mesa_glsl_error(loc, state,
"parameter `%s' must be a constant expression",
formal->name);
+ return ir_call::get_error_instruction(ctx);
}
if ((formal->mode == ir_var_out)