diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-04-09 13:11:42 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-04-09 20:41:54 -0400 |
| commit | 9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee (patch) | |
| tree | 5b50b1ed8b2eac39d1c5c39506958a04b768b6b8 /src/compiler/glsl/glsl_lexer.ll | |
| parent | cdb6fa91fa79c0c9a796730e9ecae320bebdb825 (diff) | |
| download | external_mesa3d-9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee.zip external_mesa3d-9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee.tar.gz external_mesa3d-9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee.tar.bz2 | |
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
Diffstat (limited to 'src/compiler/glsl/glsl_lexer.ll')
| -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 0b7695f..6b1ef17 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); |