From 8ac7d7fa05f34dcded533ba17ed3cec1f69e8906 Mon Sep 17 00:00:00 2001 From: Li Peng Date: Thu, 8 Apr 2010 13:52:55 -0400 Subject: intel: Call intel_prepare_render() in intelClear() Make sure we have up to date buffers before we start looking at the tiling bits to determine how to clear. --- src/mesa/drivers/dri/intel/intel_blit.c | 2 -- src/mesa/drivers/dri/intel/intel_clear.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c index 4ad42a7c280..2d676f635b7 100644 --- a/src/mesa/drivers/dri/intel/intel_blit.c +++ b/src/mesa/drivers/dri/intel/intel_blit.c @@ -247,8 +247,6 @@ intelClearWithBlit(GLcontext *ctx, GLbitfield mask) GLuint buf; all = (cw == fb->Width && ch == fb->Height); - intel_prepare_render(intel); - /* Loop over all renderbuffers */ for (buf = 0; buf < BUFFER_COUNT && mask; buf++) { const GLbitfield bufBit = 1 << buf; diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c index 03b24e2b51f..3c221188660 100644 --- a/src/mesa/drivers/dri/intel/intel_clear.c +++ b/src/mesa/drivers/dri/intel/intel_clear.c @@ -90,6 +90,10 @@ intelClear(GLcontext *ctx, GLbitfield mask) tri_mask |= (mask & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT)); } + /* Make sure we have up to date buffers before we start looking at + * the tiling bits to determine how to clear. */ + intel_prepare_render(intel); + /* HW stencil */ if (mask & BUFFER_BIT_STENCIL) { const struct intel_region *stencilRegion -- cgit v1.2.3