Ian Romanick <i...@freedesktop.org> writes: > From: Kenneth Graunke <kenn...@whitecape.org> > > Fixes es3conform's explicit_attrib_location_integer_constants. > > Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> > Reviewed-by: Eric Anholt <e...@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.
pgpBqHbEPXIYR.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev