draw: inject frontface info into wireframe outputs

[mesa.git] / src / gallium / drivers / i915 / i915_flush.c

diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c
index 911c051d1f22e4c6a692942eb2246d0b0e9f7148..0dca722d63659940833cfded681d909a6e33329a 100644 (file)
--- a/src/gallium/drivers/i915/i915_flush.c
+++ b/src/gallium/drivers/i915/i915_flush.c
@@ -33,47 +33,29 @@
 #include "pipe/p_defines.h"
 #include "draw/draw_context.h"
 #include "i915_context.h"
-#include "i915_reg.h"
 #include "i915_batch.h"
 #include "i915_debug.h"
+#include "i915_reg.h"
 
 
 static void i915_flush_pipe( struct pipe_context *pipe,
-                             unsigned flags,
-                             struct pipe_fence_handle **fence )
+                             struct pipe_fence_handle **fence,
+                             unsigned flags )
 {
    struct i915_context *i915 = i915_context(pipe);
+   enum i915_winsys_flush_flags winsys_flags = I915_FLUSH_ASYNC;
 
-   draw_flush(i915->draw);
-
-#if 0
-   /* Do we need to emit an MI_FLUSH command to flush the hardware
-    * caches?
+   /* Only shortcut this if we have no fence, otherwise we must flush the
+    * empty batchbuffer to get our fence back.
     */
-   if (flags & (PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_TEXTURE_CACHE)) {
-      unsigned flush = MI_FLUSH;
-      
-      if (!(flags & PIPE_FLUSH_RENDER_CACHE))
-        flush |= INHIBIT_FLUSH_RENDER_CACHE;
-
-      if (flags & PIPE_FLUSH_TEXTURE_CACHE)
-        flush |= FLUSH_MAP_CACHE;
-
-      if (!BEGIN_BATCH(1, 0)) {
-        FLUSH_BATCH(NULL);
-        assert(BEGIN_BATCH(1, 0));
-      }
-      OUT_BATCH( flush );
-   }
-#endif
-
-   if (i915->batch->map == i915->batch->ptr) {
+   if (!fence && i915->batch && (i915->batch->map == i915->batch->ptr)) {
       return;
    }
 
-   /* If there are no flags, just flush pending commands to hardware:
-    */
-   FLUSH_BATCH(fence);
+   if (flags == PIPE_FLUSH_END_OF_FRAME)
+      winsys_flags = I915_FLUSH_END_OF_FRAME;
+
+   FLUSH_BATCH(fence, winsys_flags);
 
    I915_DBG(DBG_FLUSH, "%s: #####\n", __FUNCTION__);
 }
@@ -87,13 +69,20 @@ void i915_init_flush_functions( struct i915_context *i915 )
  * Here we handle all the notifications that needs to go out on a flush.
  * XXX might move above function to i915_pipe_flush.c and leave this here.
  */
-void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence)
+void i915_flush(struct i915_context *i915,
+                struct pipe_fence_handle **fence,
+                unsigned flags)
 {
    struct i915_winsys_batchbuffer *batch = i915->batch;
 
-   batch->iws->batchbuffer_flush(batch, fence);
+   batch->iws->batchbuffer_flush(batch, fence, flags);
    i915->vbo_flushed = 1;
    i915->hardware_dirty = ~0;
    i915->immediate_dirty = ~0;
    i915->dynamic_dirty = ~0;
+   i915->static_dirty = ~0;
+   /* kernel emits flushes in between batchbuffers */
+   i915->flush_dirty = 0;
+   i915->fired_vertices += i915->queued_vertices;
+   i915->queued_vertices = 0;
 }