1 files changed, 38 insertions, 24 deletions

diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index 451fe525b4..b3d0d344ec 100644
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -31,29 +31,38 @@
 #include "r300_cs.h"
 #include "r300_emit.h"
 
-static void r300_flush(struct pipe_context* pipe,
-                       unsigned flags,
-                       struct pipe_fence_handle** fence)
+
+void r300_flush(struct pipe_context *pipe,
+                unsigned flags,
+                struct pipe_fence_handle **fence)
 {
     struct r300_context *r300 = r300_context(pipe);
-    struct r300_query *query;
     struct r300_atom *atom;
-    struct r300_fence **rfence = (struct r300_fence**)fence;
-
-    u_upload_flush(r300->upload_vb);
-    u_upload_flush(r300->upload_ib);
+    struct r300_winsys_bo **rfence = (struct r300_winsys_bo**)fence;
 
     if (r300->draw && !r300->draw_vbo_locked)
 	r300_draw_flush_vbuf(r300);
 
+    if (rfence) {
+        /* Create a fence, which is a dummy BO. */
+        *rfence = r300->rws->buffer_create(r300->rws, 1, 1,
+                                           PIPE_BIND_VERTEX_BUFFER,
+                                           PIPE_USAGE_STATIC,
+                                           R300_DOMAIN_GTT);
+        /* Add the fence as a dummy relocation. */
+        r300->rws->cs_add_reloc(r300->cs,
+                                r300->rws->buffer_get_cs_handle(*rfence),
+                                R300_DOMAIN_GTT, R300_DOMAIN_GTT);
+    }
+
     if (r300->dirty_hw) {
         r300_emit_hyperz_end(r300);
         r300_emit_query_end(r300);
-        if (r300->screen->caps.index_bias_supported)
+        if (r300->screen->caps.is_r500)
             r500_emit_index_bias(r300, 0);
 
         r300->flush_counter++;
-        r300->rws->cs_flush(r300->cs);
+        r300->rws->cs_flush(r300->cs, flags);
         r300->dirty_hw = 0;
 
         /* New kitchen sink, baby. */
@@ -62,30 +71,35 @@ static void r300_flush(struct pipe_context* pipe,
                 r300_mark_atom_dirty(r300, atom);
             }
         }
+        r300->vertex_arrays_dirty = TRUE;
 
         /* Unmark HWTCL state for SWTCL. */
         if (!r300->screen->caps.has_tcl) {
             r300->vs_state.dirty = FALSE;
             r300->vs_constants.dirty = FALSE;
         }
-
-        r300->validate_buffers = TRUE;
-    }
-
-    /* reset flushed query */
-    foreach(query, &r300->query_list) {
-        query->flushed = TRUE;
+    } else {
+        if (rfence) {
+            /* We have to create a fence object, but the command stream is empty
+             * and we cannot emit an empty CS. We must write some regs then. */
+            CS_LOCALS(r300);
+            OUT_CS_REG(RB3D_COLOR_CHANNEL_MASK, 0);
+            r300->rws->cs_flush(r300->cs, flags);
+        } else {
+            /* Even if hw is not dirty, we should at least reset the CS in case
+             * the space checking failed for the first draw operation. */
+            r300->rws->cs_flush(r300->cs, flags);
+        }
     }
+}
 
-    /* Create a new fence. */
-    if (rfence) {
-        *rfence = CALLOC_STRUCT(r300_fence);
-        pipe_reference_init(&(*rfence)->reference, 1);
-        (*rfence)->ctx = r300;
-    }
+static void r300_flush_wrapped(struct pipe_context *pipe,
+                               struct pipe_fence_handle **fence)
+{
+    r300_flush(pipe, 0, fence);
 }
 
 void r300_init_flush_functions(struct r300_context* r300)
 {
-    r300->context.flush = r300_flush;
+    r300->context.flush = r300_flush_wrapped;
 }