OSDN Git Service

glsl: Allow layout qualifiers in GLSL 3.00 ES
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 9 Nov 2012 20:26:42 +0000 (12:26 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 6 Dec 2012 20:13:22 +0000 (12:13 -0800)
commit62c0938639401dbf75c61ed7f6f10fd860994cfd
tree56b68b24b5a67ab19e019f9df9b009cfcc85c62c
parent486f9556548292e776781e85052ec4122180891d
glsl: Allow layout qualifiers in GLSL 3.00 ES

Note that while 'packed' is a reserved word in GLSL ES, row_major is not.
This means that we have to use the string-based matching for that.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Carl Worth <cworth@cworth.org>
src/glsl/glsl_lexer.ll
src/glsl/glsl_parser.yy
src/glsl/glsl_parser_extras.cpp