i915g: Always set vbo to flush on flushes
authorJakob Bornecrantz <wallbraker@gmail.com>
Tue, 22 Feb 2011 22:28:06 +0000 (22:28 +0000)
committerJakob Bornecrantz <wallbraker@gmail.com>
Thu, 24 Feb 2011 00:26:02 +0000 (00:26 +0000)
Reported-by Chris Wilson <chris@chris-wilson.co.uk>

src/gallium/drivers/i915/i915_flush.c

index a2c70b11991724e5021ee0c0e8c66592ba78c6da..f5435bb8453d6a7787a3ff5e112b0ce13c7cce09 100644 (file)
@@ -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;
 }