diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-06-30 17:30:03 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-28 14:14:38 -0700 |
| commit | f50f06552eb1e4af27d6fe99c381eac6a0a4ea0f (patch) | |
| tree | 76891e2f6c5f116f1feb30e36155d52269d3cfa2 /src/glsl/glsl_lexer.lpp | |
| parent | b706283c79de41caf775b0bb15b3c849932f2574 (diff) | |
glsl2: Parser support for GL_ARB_fragment_coord_conventions
Diffstat (limited to 'src/glsl/glsl_lexer.lpp')
| -rw-r--r-- | src/glsl/glsl_lexer.lpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp index b0afc44d5e..ebfea37597 100644 --- a/src/glsl/glsl_lexer.lpp +++ b/src/glsl/glsl_lexer.lpp @@ -201,6 +201,16 @@ sampler2DShadow return SAMPLER2DSHADOW; struct return STRUCT; void return VOID; +layout { + if ((yyextra->language_version >= 140) + || (yyextra->ARB_fragment_coord_conventions_enable)){ + return LAYOUT_TOK; + } else { + yylval->identifier = strdup(yytext); + return IDENTIFIER; + } + } + \+\+ return INC_OP; -- return DEC_OP; \<= return LE_OP; |