summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-07-11 11:28:58 -0700
committerMatt Turner <mattst88@gmail.com>2013-07-11 16:22:07 -0700
commit08c90f651b2d00ad2f1423512c9dfea346866102 (patch)
tree187767d7b104571fcda65e5f441490c29c644251 /src/glsl
parent14ed9018de1e8816f3b99165a6e2afb1acc1d5d7 (diff)
downloadexternal_mesa3d-08c90f651b2d00ad2f1423512c9dfea346866102.zip
external_mesa3d-08c90f651b2d00ad2f1423512c9dfea346866102.tar.gz
external_mesa3d-08c90f651b2d00ad2f1423512c9dfea346866102.tar.bz2
glsl: Add comment explaining "row_major" parsing.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/glsl_parser.yy6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 935eb2d..afbafce 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;
}