diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-02-20 15:03:55 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-03-30 22:57:17 -0400 |
| commit | 3002296cb68ebc9705b29e024e5fc67d5565ed46 (patch) | |
| tree | b912cc2b2d788129e5068d43382dfc868b173eb3 /src/compiler/glsl/glsl_lexer.ll | |
| parent | 411a88accc8a2728abbdfbef4315addbc08cf5a3 (diff) | |
| download | external_mesa3d-3002296cb68ebc9705b29e024e5fc67d5565ed46.zip external_mesa3d-3002296cb68ebc9705b29e024e5fc67d5565ed46.tar.gz external_mesa3d-3002296cb68ebc9705b29e024e5fc67d5565ed46.tar.bz2 | |
mesa: add GL_OES_shader_multisample_interpolation support
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/compiler/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/compiler/glsl/glsl_lexer.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index 5492045..0b7695f 100644 --- a/src/compiler/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll @@ -584,7 +584,7 @@ usamplerBuffer KEYWORD_WITH_ALT(140, 300, 140, 320, yyextra->EXT_texture_buffer_ /* Additional reserved words in GLSL ES 3.00 */ resource KEYWORD(0, 300, 0, 0, RESOURCE); -sample KEYWORD_WITH_ALT(400, 300, 400, 0, yyextra->ARB_gpu_shader5_enable, SAMPLE); +sample KEYWORD_WITH_ALT(400, 300, 400, 320, yyextra->ARB_gpu_shader5_enable || yyextra->OES_shader_multisample_interpolation_enable, SAMPLE); subroutine KEYWORD_WITH_ALT(400, 300, 400, 0, yyextra->ARB_shader_subroutine_enable, SUBROUTINE); |