Mesa (master): glsl: Bail after reporting an error for non-constant const_in parameters.
Dave Airlie
airlied at kemper.freedesktop.org
Thu Aug 25 20:08:58 UTC 2011
Module: Mesa
Branch: master
Commit: c25b4943322ddd31d70d87464fe32be26ac6c858
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c25b4943322ddd31d70d87464fe32be26ac6c858
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Aug 25 09:43:41 2011 -0700
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 at whitecape.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/glsl/ast_function.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index c49a33d..8b79d85 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)
More information about the mesa-commit
mailing list