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

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Simple enough.
Reviewed-by: Chad Versace <chad at chad-versace.us>


On 08/25/2011 09:43 AM, Kenneth Graunke wrote:
> 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)


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOVq4dAAoJEAIvNt057x8ieIUP/jcLkthEM8Stc2nrnE7n4xB/
6//2q5f/JawRkDuty1QbKKRMDv6gSdZq+Y5AnR2e+MiUcX4zRAdNNP7llVs44n7t
hmBBrSdyu8+TUUTKokhagFLELVr5br+DMk90/7LFKQFRy0VViFWQ8DCSmt3NO0ku
FhdF99ayze7xi9UOJMftcWI6Cj3gl4rt6or+kfw/PVRMMJytZBfEMBsbeVyrCMJo
qyl0eagJUbK8FyycdEO4xDHTchP2gl+15mTBVna/2P6Rc4PcfSkosGZLKrgCuxsA
KzrhAH4QJaVHFyI4XKi+AG2FmKHjR7G8sKcgnOxLvTnAT+ZB5vlO1K07JShjLdlF
9qhLiVVKmgwM+C1OS1yfZR5sB3vpO8/7CyDiHpXmeyA6K2PIpTlYp5eXhoTiwmu9
QFW8M5fCY8T9e89d2VSuAP4/pdtW7mv5UCszHTol0Z5s6OCYvYi1/D++6TZJLxRj
FRCUi7+sMt/QspD0rdyEHAFf1rMOeuQs29O8gMYBAXKk93nl3XAs+I06m7f6GIbo
mp9teMUIGu51cecM11DrqQOm/qEXTGoo+jc/fGUntrAUMHgiZ4jf+2QLEgsrtJ9E
OTfQyug5pofS4u82yiKtlSeSnxYHkpp+li9ZzUv0nvbGFxfPiU63lBx06PiAxP/H
mxBjTJDM/cLcTrN9vFfm
=4l/X
-----END PGP SIGNATURE-----