Mesa (master): intel: Call intel_prepare_render() in intelClear()

[Brian Paul]

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

Author: Li Peng <peng.li at intel.com>
Date:   Thu Apr  8 13:52:55 2010 -0400

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(-)

diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c
index 4ad42a7..2d676f6 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 03b24e2..3c22118 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