Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

1 files changed, 9 insertions, 1 deletions

diff --git a/src/gallium/drivers/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
index 472e0ab774..1582168eba 100644
--- a/src/gallium/drivers/i915simple/i915_flush.c
+++ b/src/gallium/drivers/i915simple/i915_flush.c
@@ -45,6 +45,7 @@ static void i915_flush( struct pipe_context *pipe,
 
    draw_flush(i915->draw);
 
+#if 0
    /* Do we need to emit an MI_FLUSH command to flush the hardware
     * caches?
     */
@@ -63,6 +64,13 @@ static void i915_flush( struct pipe_context *pipe,
       }
       OUT_BATCH( flush );
    }
+#endif
+
+#if 0
+   if (i915->batch->map == i915->batch->ptr) {
+      return;
+   }
+#endif
 
    /* If there are no flags, just flush pending commands to hardware:
     */
@@ -74,5 +82,5 @@ static void i915_flush( struct pipe_context *pipe,
 
 void i915_init_flush_functions( struct i915_context *i915 )
 {
-   i915->pipe.flush = i915_flush;
+   i915->base.flush = i915_flush;
 }