Revert "r600g: do not flush the uploader" (with comments)

This reverts commit 1c2a4f0820ff2272f993e6da28dcf8bcbbc3252a.

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 0b20b207dc6a85c189c2ec684b0ba4c222e06c8b..de9c6a52e1be7e1835004bd0c343b952cf0df780 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -68,6 +68,13 @@ static void r600_flush(struct pipe_context *ctx, unsigned flags,
        dc++;
 #endif
        r600_context_flush(&rctx->ctx);
+
+       /* XXX These shouldn't be really necessary, but removing them breaks some tests.
+        * Needless buffer reallocations may significantly increase memory consumption,
+        * so getting rid of these 3 calls is important. */
+       u_vbuf_mgr_flush_uploader(rctx->vbuf_mgr);
+       u_upload_flush(rctx->upload_ib);
+       u_upload_flush(rctx->upload_const);
 }
 
 static void r600_destroy_context(struct pipe_context *context)