From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Thu, 11 Feb 2016 20:21:02 +0000 (-0500)
Subject: mesa: allow DEPTH_STENCIL_TEXTURE_MODE queries in GLES 3.1 contexts
X-Git-Tag: upstream/17.1.0~12600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d33ef194799721b91305e9f764cfe44ba359a638;p=platform%2Fupstream%2Fmesa.git

mesa: allow DEPTH_STENCIL_TEXTURE_MODE queries in GLES 3.1 contexts

This fixes

dEQP-GLES31.functional.state_query.texture.texture_2d_multisample.depth_stencil_mode_integer

and a few related tests.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
---

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 00cea3e..614c1ee 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -500,9 +500,7 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_DEPTH_STENCIL_TEXTURE_MODE:
-      if ((_mesa_is_desktop_gl(ctx) &&
-           ctx->Extensions.ARB_stencil_texturing) ||
-          _mesa_is_gles31(ctx)) {
+      if (_mesa_has_ARB_stencil_texturing(ctx) || _mesa_is_gles31(ctx)) {
          bool stencil = params[0] == GL_STENCIL_INDEX;
          if (!stencil && params[0] != GL_DEPTH_COMPONENT)
             goto invalid_param;
@@ -1819,7 +1817,7 @@ get_tex_parameterfv(struct gl_context *ctx,
          *params = (GLfloat) obj->DepthMode;
          break;
       case GL_DEPTH_STENCIL_TEXTURE_MODE:
-         if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_stencil_texturing)
+         if (!_mesa_has_ARB_stencil_texturing(ctx) && !_mesa_is_gles31(ctx))
             goto invalid_pname;
          *params = (GLfloat)
             (obj->StencilSampling ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT);
@@ -2054,7 +2052,7 @@ get_tex_parameteriv(struct gl_context *ctx,
          *params = (GLint) obj->DepthMode;
          break;
       case GL_DEPTH_STENCIL_TEXTURE_MODE:
-         if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_stencil_texturing)
+         if (!_mesa_has_ARB_stencil_texturing(ctx) && !_mesa_is_gles31(ctx))
             goto invalid_pname;
          *params = (GLint)
             (obj->StencilSampling ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT);