diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-04-09 13:11:42 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-04-13 22:24:09 +0100 |
| commit | 5b644f3a06da76cdd6d404c98696e6d78c39c0cc (patch) | |
| tree | e6751bd49721362f58e07dfadd017444009d4238 | |
| parent | bbbcad4f0d915c31f25b1beee19cea216ced4796 (diff) | |
| download | mesa-5b644f3a06da76cdd6d404c98696e6d78c39c0cc.tar.gz | |
glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310
The GLSL 4.20 and ESSL 3.00 specs don't list 'buffer' as a reserved
keyword. Make the parser ignore it unless GLSL 4.30 / ESSL 3.10 are
used, or ARB_shader_storage_buffer_objects is enabled.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee)
| -rw-r--r-- | src/compiler/glsl/glsl_lexer.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index 9704fc7ac4f..50e862a7aab 100644 --- a/src/compiler/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll @@ -304,7 +304,7 @@ in return IN_TOK; out return OUT_TOK; inout return INOUT_TOK; uniform return UNIFORM; -buffer return BUFFER; +buffer KEYWORD_WITH_ALT(0, 0, 430, 310, yyextra->ARB_shader_storage_buffer_object_enable, BUFFER); varying DEPRECATED_ES_KEYWORD(VARYING); centroid KEYWORD(120, 300, 120, 300, CENTROID); invariant KEYWORD(120, 100, 120, 100, INVARIANT); |