st/mesa: always call FLUSH_CURRENT before st->pipe->flush()
authorKeith Whitwell <keithw@vmware.com>
Thu, 18 Feb 2010 08:59:19 +0000 (08:59 +0000)
committerKeith Whitwell <keithw@vmware.com>
Thu, 18 Feb 2010 09:03:36 +0000 (09:03 +0000)
Undoes part of commit f455ca6 which would permit pipe->flush() to be
called while the VBO module still had its buffers mapped.  Some
drivers care deeply about this.  Sorry for not spotting this earlier.

src/mesa/state_tracker/st_cb_flush.c

index 0ddfce46823566c9ac1802982b36e232b32b8ba5..573c78336c488daae3ba86a2c685acb574c9b815 100644 (file)
@@ -91,8 +91,7 @@ display_front_buffer(struct st_context *st)
 void st_flush( struct st_context *st, uint pipeFlushFlags,
                struct pipe_fence_handle **fence )
 {
-   if (pipeFlushFlags & PIPE_FLUSH_RENDER_CACHE)
-      FLUSH_CURRENT(st->ctx, 0);
+   FLUSH_CURRENT(st->ctx, 0);
 
    /* Release any vertex buffers that might potentially be accessed in
     * successive frames: