diff options
| author | Matt Turner <[email protected]> | 2011-12-23 19:21:05 -0500 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-01-04 19:27:56 -0800 |
| commit | cb96b06130c7728fe5838845325571ed18f6e983 (patch) | |
| tree | d4649ddcbfb35dddd2cdcb45c354ab6492dfd1dc /src | |
| parent | 5172383de0e7012b15c503db685b5c2ea3bfda2b (diff) | |
glsl: rename VERSION to VERSION_TOK for automake
Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 2 | ||||
| -rw-r--r-- | src/glsl/glsl_parser.yy | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index c7cfedd4232..936a90726f0 100644 --- 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 8a0377f4923..e774b4697ad 100644 --- 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; |