From f74e06bf11546b35a1ae6b4ccbf7025e844fa2d5 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 22 Feb 2006 17:18:19 +0000
Subject: [PATCH] restore swapbuffers throttling

---
 src/mesa/drivers/dri/i915/intel_blit.c    | 5 ++++-
 src/mesa/drivers/dri/i915/intel_context.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c
index 147713dc349..d915c8c77fd 100644
--- a/src/mesa/drivers/dri/i915/intel_blit.c
+++ b/src/mesa/drivers/dri/i915/intel_blit.c
@@ -61,6 +61,9 @@ void intelCopyBuffer( const __DRIdrawablePrivate *dPriv )
    intel = (struct intel_context *) dPriv->driContextPriv->driverPrivate;
    intelFlush( &intel->ctx );
 
+
+   bmFinishFence(intel->bm, intel->last_swap_fence);
+
    /* The LOCK_HARDWARE is required for the cliprects.  Buffer offsets
     * should work regardless.
     */
@@ -117,7 +120,7 @@ void intelCopyBuffer( const __DRIdrawablePrivate *dPriv )
       }
    }
 
-   intel_batchbuffer_flush( intel->batch );
+   intel->last_swap_fence = intel_batchbuffer_flush( intel->batch );
    UNLOCK_HARDWARE( intel );
 }
 
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index 8e6ec161802..1c8eca2d6ca 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -171,6 +171,7 @@ struct intel_context
    GLuint NewGLState;
    
    GLuint last_fence;
+   GLuint last_swap_fence;
 
    struct intel_batchbuffer *batch;