diff options
| author | Eric Anholt <[email protected]> | 2012-04-13 12:34:45 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-04-16 11:28:21 -0700 |
| commit | 56e2f97697846c800b2ce53ad0bed87e3c1a5767 (patch) | |
| tree | 99768406c57ed9f1bfe479b40f8029c3dc566fe1 /src/glsl/glsl_lexer.ll | |
| parent | d91c8edd851839799d8338ecc127ea004d76fcab (diff) | |
glsl: Mark [iu]sampler{Buffer,2DRect}as reserved in GLSL 1.40.
The non-integer versions were already reserved in 1.30, but apparently
these were forgotten.
Fixes piglit glsl-1.40/compiler/reserved/
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index 936a90726f0..2028d7f4768 100644 --- a/src/glsl/glsl_lexer.ll +++ b/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; |