diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-17 08:19:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-17 08:19:12 +0200 |
| commit | 66ef63554438d427d0ddb2137baf48a653a89dd3 (patch) | |
| tree | df7212290cc842fb715edc0ed973e3b535d30548 /mesalib/src/glsl/glsl_lexer.ll | |
| parent | a32ffa892cbd6e7ee6153cb9b2f854b4a99c180c (diff) | |
| parent | c1194ccd395fdbb23c9ab56bc340ee20a5feeb82 (diff) | |
| download | vcxsrv-66ef63554438d427d0ddb2137baf48a653a89dd3.tar.gz vcxsrv-66ef63554438d427d0ddb2137baf48a653a89dd3.tar.bz2 vcxsrv-66ef63554438d427d0ddb2137baf48a653a89dd3.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/glsl_lexer.ll')
| -rw-r--r-- | mesalib/src/glsl/glsl_lexer.ll | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll index 936a90726..2028d7f47 100644 --- a/mesalib/src/glsl/glsl_lexer.ll +++ b/mesalib/src/glsl/glsl_lexer.ll @@ -470,6 +470,12 @@ iimageBuffer KEYWORD(130, 999, IIMAGEBUFFER); uimageBuffer KEYWORD(130, 999, UIMAGEBUFFER); row_major KEYWORD(130, 999, ROW_MAJOR); + /* Additional reserved words in GLSL 1.40 */ +isampler2DRect KEYWORD(140, 140, ISAMPLER2DRECT); +usampler2DRect KEYWORD(140, 140, USAMPLER2DRECT); +isamplerBuffer KEYWORD(140, 140, ISAMPLERBUFFER); +usamplerBuffer KEYWORD(140, 140, USAMPLERBUFFER); + [_a-zA-Z][_a-zA-Z0-9]* { struct _mesa_glsl_parse_state *state = yyextra; void *ctx = state; |