On 11/30/2012 02:52 PM, Ian Romanick wrote:
On 11/30/2012 02:49 PM, Eric Anholt wrote:
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.
Isn't the ; necessary? Every other rule in the grammar has it.
Apparently I accidentally pushed v1 of this on master which was missing
the semicolon. I'm not sure why it works without the semicolon, but it
definitely ought to be there.
That said, this patch is no longer "glsl: Support unsigned integer
constants in layout qualifiers." I would rename it to "glsl: Fix
missing semicolon in integer_constant rule."
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
