On Thu, Feb 11, 2016 at 03:22:35PM -0500, Ilia Mirkin wrote: Reviewed-by: Nanley Chery <[email protected]>
> 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 <[email protected]> > --- > src/mesa/main/texparam.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c > index 89f286c..ed83830 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); > -- > 2.4.10 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
