summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/enable.c
diff options
context:
space:
mode:
authorMarta Lofstedt <marta.lofstedt@intel.com>2015-05-11 15:03:50 +0200
committerTapani Pälli <tapani.palli@intel.com>2015-08-03 12:30:50 +0300
commit4f8e4a95dbd806bc735bf93dda245be2bb2ea454 (patch)
treee11c754b9ea62f93d3b89c56399465bb287cae80 /src/mesa/main/enable.c
parent2e0179e2b3b9ea369816597f789a5bda7e0c46b5 (diff)
downloadexternal_mesa3d-4f8e4a95dbd806bc735bf93dda245be2bb2ea454.zip
external_mesa3d-4f8e4a95dbd806bc735bf93dda245be2bb2ea454.tar.gz
external_mesa3d-4f8e4a95dbd806bc735bf93dda245be2bb2ea454.tar.bz2
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@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/mesa/main/enable.c')
-rw-r--r--src/mesa/main/enable.c2
1 files changed, 1 insertions, 1 deletions
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)