summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2004-06-16 12:03:53 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2004-06-16 12:03:53 +0000
commit6d43ce54024ede3ef91fc00d00bf19b815f6396e (patch)
treeb1f2074cc03e3846e751fff2d7b0ee11e23dfb12 /src/mesa/drivers/dri/i915
parentfff749e893b0adbfb57d08370cb4d2a10608bc52 (diff)
Fix batch.ptr when dropping a batchbuffer segment due to zero cliprects.
Diffstat (limited to 'src/mesa/drivers/dri/i915')
-rw-r--r--src/mesa/drivers/dri/i915/intel_ioctl.c3
1 files changed, 2 insertions, 1 deletions
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 );
}