From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 25 Feb 2019 11:23:27 +0000 (+0100)
Subject: mesa/main: clean up extension-check for GL_SAMPLE_MASK
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=551b61528f6754aa91948ed13821cf2c90cf8970;p=mesa.git

mesa/main: clean up extension-check for GL_SAMPLE_MASK

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 31918c23fcf..c4c3a0c27fb 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1136,9 +1136,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
 
       /* ARB_texture_multisample */
       case GL_SAMPLE_MASK:
-         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+         if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
             goto invalid_enum_error;
-         CHECK_EXTENSION(ARB_texture_multisample);
          if (ctx->Multisample.SampleMask == state)
             return;
          FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleMask ? 0 :
@@ -1758,9 +1757,8 @@ _mesa_IsEnabled( GLenum cap )
 
       /* ARB_texture_multisample */
       case GL_SAMPLE_MASK:
-         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+         if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
             goto invalid_enum_error;
-         CHECK_EXTENSION(ARB_texture_multisample);
          return ctx->Multisample.SampleMask;
 
       /* ARB_sample_shading */