[Mesa-dev] [PATCH] glsl: Bail after reporting an error for non-constant const_in parameters.

Kenneth Graunke kenneth at whitecape.org
Thu Aug 25 09:43:41 PDT 2011


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>
---
 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)
-- 
1.7.6



More information about the mesa-dev mailing list