diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2012-05-11 00:19:42 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-06 09:48:11 -0700 |
| commit | a72fdfed7b042d26c9a83deccefab2cd0eb66ed8 (patch) | |
| tree | 7a42b3c3302ec71838959ae2abe6cb63ef00517b | |
| parent | ba45b6deeaf89d224510eaa92ed588881c5de729 (diff) | |
| download | mesa-a72fdfed7b042d26c9a83deccefab2cd0eb66ed8.tar.gz | |
i830: Fix crash for GL_STENCIL_TEST in i830Enable()
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@roeckx.be>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit f92b2e5e90f456491fc15b3b9612381a83726606)
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index ea6e0beaeab..669fea8fc8d 100644 --- a/src/mesa/drivers/dri/i915/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c @@ -861,7 +861,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); |