summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorMarta Lofstedt <[email protected]>2015-05-11 15:03:55 +0200
committerTapani Pälli <[email protected]>2015-08-03 12:32:06 +0300
commit2253a296c9ad7b11f9844640024c5f0784e4e528 (patch)
tree0d1c6c3b0ac2efce3043c9ff1aba865f6f3b0dfc /src/mesa/main
parent0fe81a25f7102d78dbe8f7e89d2b024b1741da1c (diff)
mesa/es3.1: Allow query of GL_TEXTURE_MULTISAMPLE
GLES 3.1 must allow a query for GL_TEXTURE_MULTISAMPLE. Signed-off-by: Marta Lofstedt <[email protected]> Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/formatquery.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index fe96d5b29fb..85f7b6b5664 100644
--- a/src/mesa/main/formatquery.c
+++ b/src/mesa/main/formatquery.c
@@ -74,7 +74,9 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
/* These enums are only valid if ARB_texture_multisample is supported */
- if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample)
+ if ((_mesa_is_desktop_gl(ctx) &&
+ ctx->Extensions.ARB_texture_multisample) ||
+ _mesa_is_gles31(ctx))
break;
default: