Mesa (master): i915g: Always set vbo to flush on flushes

[Jakob Bornecrantz]

Module: Mesa
Branch: master
Commit: 4407e5078f6083e4e56ba5970d0fa10d504ed45b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4407e5078f6083e4e56ba5970d0fa10d504ed45b

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Tue Feb 22 22:28:06 2011 +0000

i915g: Always set vbo to flush on flushes

Reported-by Chris Wilson <chris at chris-wilson.co.uk>

---

 src/gallium/drivers/i915/i915_flush.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c
index a2c70b1..f5435bb 100644
--- a/src/gallium/drivers/i915/i915_flush.c
+++ b/src/gallium/drivers/i915/i915_flush.c
@@ -74,7 +74,6 @@ static void i915_flush_pipe( struct pipe_context *pipe,
    /* If there are no flags, just flush pending commands to hardware:
     */
    FLUSH_BATCH(fence);
-   i915->vbo_flushed = 1;
 
    I915_DBG(DBG_FLUSH, "%s: #####\n", __FUNCTION__);
 }
@@ -93,5 +92,6 @@ void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence)
    struct i915_winsys_batchbuffer *batch = i915->batch;
 
    batch->iws->batchbuffer_flush(batch, fence);
+   i915->vbo_flushed = 1;
    i915->hardware_dirty = ~0;
 }