replace _mesa_logbase2 with util_logbase2

[mesa.git] / src / mesa / state_tracker / st_cb_flush.c

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 5b3188c1ff65d16c28c678f945c94d072d5f1592..08b645433ac40d15a33434b904e784285ea322f5 100644 (file)
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -39,6 +39,7 @@
 #include "st_cb_flush.h"
 #include "st_cb_clear.h"
 #include "st_cb_fbo.h"
+#include "st_context.h"
 #include "st_manager.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
@@ -51,7 +52,10 @@ st_flush(struct st_context *st,
          struct pipe_fence_handle **fence,
          unsigned flags)
 {
-   st_flush_bitmap_cache(st);
+   /* We want to call this function periodically.
+    * Typically, it has nothing to do so it shouldn't be expensive.
+    */
+   st_context_free_zombie_objects(st);
 
    st->pipe->flush(st->pipe, fence, flags);
 }
@@ -65,6 +69,7 @@ st_finish(struct st_context *st)
 {
    struct pipe_fence_handle *fence = NULL;
 
+   st_flush_bitmap_cache(st);
    st_flush(st, &fence, PIPE_FLUSH_ASYNC | PIPE_FLUSH_HINT_FINISH);
 
    if (fence) {
@@ -86,6 +91,8 @@ st_glFlush(struct gl_context *ctx)
 {
    struct st_context *st = st_context(ctx);
 
+   st_flush_bitmap_cache(st);
+
    /* Don't call st_finish() here.  It is not the state tracker's
     * responsibilty to inject sleeps in the hope of avoiding buffer
     * synchronization issues.  Calling finish() here will just hide
@@ -130,6 +137,18 @@ gl_reset_status_from_pipe_reset_status(enum pipe_reset_status status)
 }
 
 
+static void
+st_device_reset_callback(void *data, enum pipe_reset_status status)
+{
+   struct st_context *st = data;
+
+   assert(status != PIPE_NO_RESET);
+
+   st->reset_status = status;
+   _mesa_set_context_lost_dispatch(st->ctx);
+}
+
+
 /**
  * Query information about GPU resets observed by this context
  *
@@ -146,24 +165,14 @@ st_get_graphics_reset_status(struct gl_context *ctx)
       st->reset_status = PIPE_NO_RESET;
    } else {
       status = st->pipe->get_device_reset_status(st->pipe);
+      if (status != PIPE_NO_RESET)
+         st_device_reset_callback(st, status);
    }
 
    return gl_reset_status_from_pipe_reset_status(status);
 }
 
 
-static void
-st_device_reset_callback(void *data, enum pipe_reset_status status)
-{
-   struct st_context *st = data;
-
-   assert(status != PIPE_NO_RESET);
-
-   st->reset_status = status;
-   _mesa_set_context_lost_dispatch(st->ctx);
-}
-
-
 void
 st_install_device_reset_callback(struct st_context *st)
 {