From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 18 Feb 2010 08:59:19 +0000 (+0000)
Subject: st/mesa: always call FLUSH_CURRENT before st->pipe->flush()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=37e955d491664d27b1335c60ee40b730af6a1515;p=mesa.git

st/mesa: always call FLUSH_CURRENT before st->pipe->flush()

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.
---

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 0ddfce46823..573c78336c4 100644
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -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: