1 files changed, 25 insertions, 12 deletions

diff --git a/src/gallium/drivers/svga/svga_pipe_flush.c b/src/gallium/drivers/svga/svga_pipe_flush.c
index ab243aa6ec5..9357d827f28 100644
--- a/src/gallium/drivers/svga/svga_pipe_flush.c
+++ b/src/gallium/drivers/svga/svga_pipe_flush.c
@@ -24,6 +24,7 @@
  **********************************************************/
 
 #include "pipe/p_defines.h"
+#include "util/u_string.h"
 #include "svga_screen.h"
 #include "svga_surface.h"
 #include "svga_context.h"
@@ -35,20 +36,10 @@ static void svga_flush( struct pipe_context *pipe,
                         struct pipe_fence_handle **fence )
 {
    struct svga_context *svga = svga_context(pipe);
-   int i;
 
-   /* Emit buffered drawing commands.
+   /* Emit buffered drawing commands, and any back copies.
     */
-   svga_hwtnl_flush_retry( svga );
-
-   /* Emit back-copy from render target view to texture.
-    */
-   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
-      if (svga->curr.framebuffer.cbufs[i])
-         svga_propagate_surface(pipe, svga->curr.framebuffer.cbufs[i]);
-   }
-   if (svga->curr.framebuffer.zsbuf)
-      svga_propagate_surface(pipe, svga->curr.framebuffer.zsbuf);
+   svga_surfaces_flush( svga );
 
    /* Flush command queue.
     */
@@ -56,6 +47,28 @@ static void svga_flush( struct pipe_context *pipe,
 
    SVGA_DBG(DEBUG_DMA|DEBUG_PERF, "%s flags %x fence_ptr %p\n",
             __FUNCTION__, flags, fence ? *fence : 0x0);
+
+   /* Enable to dump BMPs of the color/depth buffers each frame */
+   if (0) {
+      if (flags & PIPE_FLUSH_FRAME) {
+         struct pipe_framebuffer_state *fb = &svga->curr.framebuffer;
+         static unsigned frame_no = 1;
+         char filename[256];
+         unsigned i;
+
+         for (i = 0; i < fb->nr_cbufs; i++) {
+            util_snprintf(filename, sizeof(filename), "cbuf%u_%04u", i, frame_no);
+            debug_dump_surface_bmp(&svga->pipe, filename, fb->cbufs[i]);
+         }
+
+         if (0 && fb->zsbuf) {
+            util_snprintf(filename, sizeof(filename), "zsbuf_%04u", frame_no);
+            debug_dump_surface_bmp(&svga->pipe, filename, fb->zsbuf);
+         }
+
+         ++frame_no;
+      }
+   }
 }