浏览代码

glsl: rename VERSION to VERSION_TOK for automake

Signed-off-by: Matt Turner <mattst88@gmail.com>
tags/mesa-8.0-rc1
Matt Turner 14 年前
父节点
当前提交
cb96b06130
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1
    1
      src/glsl/glsl_lexer.ll
  2. 2
    2
      src/glsl/glsl_parser.yy

+ 1
- 1
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

+ 2
- 2
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;


正在加载...
取消
保存