summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2010-02-18 08:59:19 +0000
committerKeith Whitwell <keithw@vmware.com>2010-02-18 09:03:36 +0000
commit37e955d491664d27b1335c60ee40b730af6a1515 (patch)
tree8dd24aa9b97010c1ef446d93c30ef52a97900641
parent64d18b819b4a1d3ecaac7741d1906ecc7aa3f49e (diff)
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.
-rw-r--r--src/mesa/state_tracker/st_cb_flush.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 0ddfce4682..573c78336c 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: