Mesa (master): mesa/es3.1: Allow GL_DEPTH_STENCIL_TEXTURE_MODE

[Tapani Pälli]

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

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

mesa/es3.1: Allow GL_DEPTH_STENCIL_TEXTURE_MODE

GLES 3.1 must support the parameter GL_DEPTH_STENCIL_TEXTURE_MODE.

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

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

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 88c2c14..c0611c3 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -500,7 +500,9 @@ 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) {
+      if ((_mesa_is_desktop_gl(ctx) &&
+           ctx->Extensions.ARB_stencil_texturing) ||
+          _mesa_is_gles31(ctx)) {
          bool stencil = params[0] == GL_STENCIL_INDEX;
          if (!stencil && params[0] != GL_DEPTH_COMPONENT)
             goto invalid_param;