Merge branch '7.8' into master

[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 0ddfce46823566c9ac1802982b36e232b32b8ba5..30e7afcf2a317e3ff32043eaca82560cb4d7b38e 100644 (file)
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -40,6 +40,7 @@
 #include "st_cb_clear.h"
 #include "st_cb_fbo.h"
 #include "st_public.h"
+#include "st_manager.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
@@ -74,12 +75,9 @@ display_front_buffer(struct st_context *st)
       = st_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
 
    if (strb) {
-      struct pipe_surface *front_surf = strb->surface;
-      
       /* Hook for copying "fake" frontbuffer if necessary:
        */
-      st->pipe->screen->flush_frontbuffer( st->pipe->screen, front_surf,
-                                           st->pipe->priv );
+      st_manager_flush_frontbuffer(st);
 
       /*
         st->frontbuffer_status = FRONT_STATUS_UNDEFINED;
@@ -91,8 +89,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:
@@ -103,10 +100,6 @@ void st_flush( struct st_context *st, uint pipeFlushFlags,
    util_gen_mipmap_flush(st->gen_mipmap);
 
    st->pipe->flush( st->pipe, pipeFlushFlags, fence );
-
-   if ((pipeFlushFlags & PIPE_FLUSH_FRAME) &&
-       is_front_buffer_dirty(st))
-      display_front_buffer(st);
 }
 
 
@@ -140,6 +133,10 @@ static void st_glFlush(GLcontext *ctx)
     * problems that need to be fixed elsewhere.
     */
    st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, NULL);
+
+   if (is_front_buffer_dirty(st)) {
+      display_front_buffer(st);
+   }
 }
 
 
@@ -151,6 +148,10 @@ static void st_glFinish(GLcontext *ctx)
    struct st_context *st = ctx->st;
 
    st_finish(st);
+
+   if (is_front_buffer_dirty(st)) {
+      display_front_buffer(st);
+   }
 }