Mesa (11.2): glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310

[Emil Velikov]

Module: Mesa
Branch: 11.2
Commit: 5b644f3a06da76cdd6d404c98696e6d78c39c0cc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b644f3a06da76cdd6d404c98696e6d78c39c0cc

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Apr  9 13:11:42 2016 -0400

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 at alum.mit.edu>
Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 9b5bd20eb2d09e1ec2319b55c83ad7f28b6fefee)

---

 src/compiler/glsl/glsl_lexer.ll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 9704fc7..50e862a 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);