st/mesa: check in advance in st_draw_vbo whether the bitmap cache is empty

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 8069f107880240a94ecc1fe3d074da7f90fde50c..d16160b656b67bc3b34dcd8db3db9cc12cd5909e 100644 (file)
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -182,7 +182,9 @@ st_draw_vbo(struct gl_context *ctx,
    /* Mesa core state should have been validated already */
    assert(ctx->NewState == 0x0);
 
-   st_flush_bitmap_cache(st);
+   if (unlikely(!st->bitmap.cache.empty))
+      st_flush_bitmap_cache(st);
+
    st_invalidate_readpix_cache(st);
 
    /* Validate state. */