From: Zou Nan hai <nanhai.zou@intel.com>
Date: Tue, 15 Jan 2008 07:19:09 +0000 (+0800)
Subject:  i965: fix an assert fail in brw_new_batch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3ad9ca8240ffa32a8dfbfffd0cfb1d0384e04a9f;p=mesa.git

 i965: fix an assert fail in brw_new_batch
---

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 63547f386d3..72c6221ef76 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -284,8 +284,10 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx,
        * an upper bound of how much we might emit in a single
        * brw_try_draw_prims().
        */
-      if (intel->batch->ptr - intel->batch->map > intel->batch->size * 3 / 4)
-	 intel_batchbuffer_flush(intel->batch);
+      if (intel->batch->ptr - intel->batch->map > intel->batch->size * 3 / 4
+	/* brw_emit_prim may change the cliprect_mode to LOOP_CLIPRECTS */
+	|| intel->batch->cliprect_mode != LOOP_CLIPRECTS) 
+	      intel_batchbuffer_flush(intel->batch);
 
       brw->no_batch_wrap = GL_TRUE;