From 08c90f651b2d00ad2f1423512c9dfea346866102 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 11 Jul 2013 11:28:58 -0700 Subject: [PATCH] glsl: Add comment explaining "row_major" parsing. Reviewed-by: Kenneth Graunke --- src/glsl/glsl_parser.yy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 935eb2d83e4..afbafce4cba 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1155,6 +1155,12 @@ layout_qualifier_id: $$.flags.q.shared = 1; } else if (strcmp($1, "column_major") == 0) { $$.flags.q.column_major = 1; + /* "row_major" is a reserved word in GLSL 1.30+. Its token is parsed + * below in the interface_block_layout_qualifier rule. + * + * It is not a reserved word in GLSL ES 3.00, so it's handled here as + * an identifier. + */ } else if (strcmp($1, "row_major") == 0) { $$.flags.q.row_major = 1; } -- 2.30.2