[Mesa-dev] [PATCH 26/26] glsl: Support unsigned integer constants in layout qualifiers.

[Eric Anholt]

Ian Romanick <idr at freedesktop.org> writes:

> From: Kenneth Graunke <kenneth at whitecape.org>
>
> Fixes es3conform's explicit_attrib_location_integer_constants.
>
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> Reviewed-by: Eric Anholt <eric at anholt.net>
> ---
>  src/glsl/glsl_parser.yy | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
> index f123368..d849466 100644
> --- a/src/glsl/glsl_parser.yy
> +++ b/src/glsl/glsl_parser.yy
> @@ -1088,6 +1088,7 @@ layout_qualifier_id_list:
>  integer_constant:
>  	INTCONSTANT { $$ = $1; }
>  	| UINTCONSTANT { $$ = $1; }
> +	;

this looks like rebase leftovers that could just be dropped.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20121130/0200f311/attachment.pgp>