projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e0179e)
mesa/es3.1: Allow GL_SAMPLE_MASK
authorMarta Lofstedt <marta.lofstedt@intel.com>
Mon, 11 May 2015 13:03:50 +0000 (15:03 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 3 Aug 2015 09:30:50 +0000 (12:30 +0300)
GLES 3.1 should be allowed to enable GL_SAMPLE_MASK.

Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/mesa/main/enable.c patch | blob | history

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index d0583edc019e74be565609aec00137ed6d81281c..adba03576c157829ba819b4a078be4dee8ef9728 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1001,7 +1001,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
 
       /* ARB_texture_multisample */
       case GL_SAMPLE_MASK:
-         if (!_mesa_is_desktop_gl(ctx))
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
             goto invalid_enum_error;
          CHECK_EXTENSION(ARB_texture_multisample, cap);
          if (ctx->Multisample.SampleMask == state)