gallium: fold st_gl_flush() into st_glFlush()

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 1fc3a20d05cbfe579129ad6efca6aa6130b11e64..d60ad7b82ab235c6122fa93ad3021687e18d8055 100644 (file)
--- 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);
 }