Mesa (master): mesa/es3.1: Allow query of GL_TEXTURE_MULTISAMPLE

[Tapani Pälli]

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

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

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 <marta.lofstedt at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/mesa/main/formatquery.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index fe96d5b..85f7b6b 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: