From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 16 Jun 2004 12:03:53 +0000 (+0000)
Subject: Fix batch.ptr when dropping a batchbuffer segment due to zero cliprects.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6d43ce54024ede3ef91fc00d00bf19b815f6396e;p=mesa.git

Fix batch.ptr when dropping a batchbuffer segment due to zero cliprects.
---

diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c
index 2fa88b52014..ce20acbe564 100644
--- a/src/mesa/drivers/dri/i915/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915/intel_ioctl.c
@@ -142,7 +142,6 @@ void intelFlushBatchLocked( intelContextPtr intel,
     * single buffer.
     */
    if (intel->numClipRects == 0 && !ignore_cliprects) {
-      intel->batch.space = intel->batch.size;
       
       /* Without this yeild, an application with no cliprects can hog
        * the hardware.  Without unlocking, the effect is much worse -
@@ -157,6 +156,8 @@ void intelFlushBatchLocked( intelContextPtr intel,
       /* Note that any state thought to have been emitted actually
        * hasn't:
        */
+      intel->batch.ptr -= (intel->batch.size - intel->batch.space);
+      intel->batch.space = intel->batch.size;
       intel->vtbl.lost_hardware( intel ); 
    }