Ian Romanick <[email protected]> writes:

> From: Kenneth Graunke <[email protected]>
>
> Fixes es3conform's explicit_attrib_location_integer_constants.
>
> Reviewed-by: Ian Romanick <[email protected]>
> Reviewed-by: Eric Anholt <[email protected]>
> ---
>  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.

Attachment: pgpBqHbEPXIYR.pgp
Description: PGP signature

_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to