Mesa (master): mesa/es3.1: Allow GL_SAMPLE_MASK

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 4f8e4a95dbd806bc735bf93dda245be2bb2ea454
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f8e4a95dbd806bc735bf93dda245be2bb2ea454

Author: Marta Lofstedt <marta.lofstedt at intel.com>
Date:   Mon May 11 15:03:50 2015 +0200

mesa/es3.1: Allow GL_SAMPLE_MASK

GLES 3.1 should be allowed to enable GL_SAMPLE_MASK.

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/mesa/main/enable.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index d0583ed..adba035 100644
--- 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)