summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-04-09 16:30:28 -0600
committerBrian Paul <[email protected]>2008-04-09 16:30:28 -0600
commit574f964667c5ec35f4832c839a9dcc24f92e2aab (patch)
tree60bba4cce22afdd7376af9a4d764155d23b12024
parent9c86c0e88b09370584f767747c52b7f352844ac5 (diff)
gallium: fold st_gl_flush() into st_glFlush()
-rw-r--r--src/mesa/state_tracker/st_cb_flush.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 1fc3a20d05c..d60ad7b82ab 100644
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -102,23 +102,16 @@ void st_flush( struct st_context *st, uint pipeFlushFlags,
}
-static void st_gl_flush( struct st_context *st, uint pipeFlushFlags,
- struct pipe_fence_handle **fence )
-{
- st_flush_bitmap_cache(st);
-
- FLUSH_VERTICES(st->ctx, 0);
-
- flush_front_buffer(st, pipeFlushFlags, fence);
-}
-
-
/**
* Called via ctx->Driver.Flush()
*/
static void st_glFlush(GLcontext *ctx)
{
- st_gl_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
+ st_flush_bitmap_cache(ctx->st);
+
+ FLUSH_VERTICES(ctx, 0);
+
+ flush_front_buffer(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
}