[Mesa-dev] [PATCH] i830_state:i830Enable(): Fix crash for GL_STENCIL_TEST

[Kurt Roeckx]

Can someone please review and commit this?  A lot of the piglit
tests fail because of this.


Kurt

On Fri, May 11, 2012 at 12:19:42AM +0200, Kurt Roeckx wrote:
> commit 87f12bb2d95236c7b025d1a8be56b5ab1683d702 tried to fix rb->mt
> being NULL, but change this case wrong.
> 
> Note: this is a candidate for the 8.0 branch
> 
> Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
> ---
>  src/mesa/drivers/dri/i915/i830_state.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c
> index 6f8bd69..647ba62 100644
> --- a/src/mesa/drivers/dri/i915/i830_state.c
> +++ b/src/mesa/drivers/dri/i915/i830_state.c
> @@ -862,7 +862,7 @@ i830Enable(struct gl_context * ctx, GLenum cap, GLboolean state)
>           if (ctx->DrawBuffer) {
>              struct intel_renderbuffer *irbStencil
>                 = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_STENCIL);
> -            hw_stencil = (irbStencil && irbStencil->mt->region);
> +            hw_stencil = (irbStencil && irbStencil->mt);
>           }
>           if (hw_stencil) {
>              I830_STATECHANGE(i830, I830_UPLOAD_CTX);
> -- 
> 1.7.10
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>