glsl: rename VERSION to VERSION_TOK for automake

Signed-off-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index c7cfedd423202fa680d50874a64e5dffb01157ab..936a90726f06cb0af59d85ffffaf7166d43f6902 100644 (file)
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -148,7 +148,7 @@ HASH                ^{SPC}#{SPC}
 
     /* Preprocessor tokens. */ 
 ^[ \t]*#[ \t]*$                        ;
-^[ \t]*#[ \t]*version          { BEGIN PP; return VERSION; }
+^[ \t]*#[ \t]*version          { BEGIN PP; return VERSION_TOK; }
 ^[ \t]*#[ \t]*extension                { BEGIN PP; return EXTENSION; }
 {HASH}line{SPCP}{INT}{SPCP}{INT}{SPC}$ {
                                   /* Eat characters until the first digit is

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 8a0377f492352778c9ea00de4aa53c5d83b8519c..e774b4697ad8fb381b54f59599a38a62b7d02424 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -118,7 +118,7 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
 %token INVARIANT
 %token LOWP MEDIUMP HIGHP SUPERP PRECISION
 
-%token VERSION EXTENSION LINE COLON EOL INTERFACE OUTPUT
+%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE OUTPUT
 %token PRAGMA_DEBUG_ON PRAGMA_DEBUG_OFF
 %token PRAGMA_OPTIMIZE_ON PRAGMA_OPTIMIZE_OFF
 %token PRAGMA_INVARIANT_ALL
@@ -246,7 +246,7 @@ translation_unit:
 
 version_statement:
        /* blank - no #version specified: defaults are already set */
-       | VERSION INTCONSTANT EOL
+       | VERSION_TOK INTCONSTANT EOL
        {
           bool supported = false;