Emit cliprects in the userspace driver as required, rather than

passing them to the kernel.  This works because all drawing commands
in the 965 driver are emitted with the lock held and the batchbuffer
is always flushed prior to releasing the lock.  This allows multiple
cliprects to be dealt with, without replaying entire batchbuffers and
redundantly re-emitting state.

1 files changed, 1 insertions, 19 deletions

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 598ce08735..64885ed9b4 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -128,7 +128,6 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
    struct intel_context *intel = batch->intel;
    GLuint used = batch->ptr - (batch->map + batch->offset);
    GLuint offset;
-   GLboolean ignore_cliprects = (batch->flags & INTEL_BATCH_CLIPRECTS) ? GL_FALSE : GL_TRUE;
    GLint retval = GL_TRUE;
 
    assert(intel->locked);
@@ -138,22 +137,6 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
       return GL_TRUE;
    }
 
-   /* Throw away non-effective packets.  
-    */
-   if (intel->numClipRects == 0 && !ignore_cliprects) {
-      batch->ptr = batch->map + batch->offset;
-      bmReleaseBuffers( batch->intel );
-      intel->vtbl.lost_hardware(intel);
-      batch->flags = 0;
-
-      UNLOCK_HARDWARE(intel);
-      sched_yield();
-      LOCK_HARDWARE(intel);
-
-      return GL_TRUE;
-   }
-
-
    /* Add the MI_BATCH_BUFFER_END.  Always add an MI_FLUSH - this is a
     * performance drain that we would like to avoid.
     */
@@ -204,8 +187,7 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
     */
    intel_batch_ioctl(batch->intel, 
 		     offset + batch->offset,
-		     used,
-		     ignore_cliprects);
+		     used);
 
    if (intel->aub_file && 
        intel->ctx.DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_FRONT_LEFT)