[Mesa-dev] Mesa (master): mesa: Validate assembly shaders when GLSL shaders are used

Brian Paul brianp at vmware.com
Tue Oct 12 12:29:36 PDT 2010


On 10/12/2010 11:55 AM, Ian Romanick wrote:
> Module: Mesa
> Branch: master
> Commit: b2b9b22c1013ebf02aa6f0d9c1c7b5267523d973
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2b9b22c1013ebf02aa6f0d9c1c7b5267523d973
>
> Author: Ian Romanick<ian.d.romanick at intel.com>
> Date:   Tue Oct 12 10:51:47 2010 -0700
>
> mesa: Validate assembly shaders when GLSL shaders are used
>
> If an GLSL shader is used that does not provide all stages and
> assembly shaders are provided for the missing stages, validate the
> assembly shaders.
>
> Fixes bugzilla #30787 and piglit tests glsl-invalid-asm0[12].
>
> NOTE: this is a candidate for the 7.9 branch.
>
> ---
>
>   src/mesa/main/context.c |   52 ++++++++++++++++++++++++++++++++++++----------
>   1 files changed, 40 insertions(+), 12 deletions(-)
>
> diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
> index 0013251..284c8b1 100644
> --- a/src/mesa/main/context.c
> +++ b/src/mesa/main/context.c
> @@ -137,7 +137,7 @@
>   #endif
>
>   #include "glsl_parser_extras.h"
> -
> +#include<stdbool.h>

Ian, could we stick with GLboolean/GL_TRUE/GL_FALSE in core Mesa to be 
consistent?  It wouldn't surprise me if stdbool.h isn't present on one 
platform or another.

-Brian


More information about the mesa-dev mailing list