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

Tapani Pälli tpalli at kemper.freedesktop.org
Mon Aug 3 09:45:23 UTC 2015


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

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

mesa/es3.1: Allow enable of GL_SAMPLE_MASK

GLES 3.1 must be able 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 adba035..42f6799 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1603,7 +1603,7 @@ _mesa_IsEnabled( GLenum cap )
 
       /* 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);
          return ctx->Multisample.SampleMask;




More information about the mesa-commit mailing list