diff options
| author | Chia-I Wu <[email protected]> | 2011-10-23 18:51:06 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-11-03 15:09:44 +0800 |
| commit | 2903816aadb281716b6c59a5a48aeadb84a08f50 (patch) | |
| tree | 23f372e51fdf5da3e37f3c3d8051458e340beed7 /src/glsl/glsl_parser.yy | |
| parent | db73264e1471a594d49ca0bc397cbb6746ee1dce (diff) | |
glsl: add support for GL_OES_EGL_image_external
This extension introduces a new sampler type: samplerExternalOES.
texture2D (and texture2DProj) can be used to do a texture look up in an
external texture.
Reviewed-by: Brian Paul <[email protected]>
Acked-by: Jakob Bornecrantz <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 25d02fb1eaf..d32d6e4e1ce 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -92,6 +92,7 @@ %token SAMPLER2DARRAYSHADOW ISAMPLER1D ISAMPLER2D ISAMPLER3D ISAMPLERCUBE %token ISAMPLER1DARRAY ISAMPLER2DARRAY USAMPLER1D USAMPLER2D USAMPLER3D %token USAMPLERCUBE USAMPLER1DARRAY USAMPLER2DARRAY +%token SAMPLEREXTERNALOES %token STRUCT VOID_TOK WHILE %token <identifier> IDENTIFIER TYPE_IDENTIFIER NEW_IDENTIFIER %type <identifier> any_identifier @@ -1368,6 +1369,7 @@ basic_type_specifier_nonarray: | SAMPLER2DRECT { $$ = ast_sampler2drect; } | SAMPLER3D { $$ = ast_sampler3d; } | SAMPLERCUBE { $$ = ast_samplercube; } + | SAMPLEREXTERNALOES { $$ = ast_samplerexternaloes; } | SAMPLER1DSHADOW { $$ = ast_sampler1dshadow; } | SAMPLER2DSHADOW { $$ = ast_sampler2dshadow; } | SAMPLER2DRECTSHADOW { $$ = ast_sampler2drectshadow; } |