Module: Mesa Branch: master Commit: d8d5c2660f581821f017fdcb7954c6f7bd099114 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8d5c2660f581821f017fdcb7954c6f7bd099114
Author: Marek Olšák <[email protected]> Date: Tue Feb 8 12:09:29 2011 +0100 Revert "r600g: do not flush the uploader" (with comments) This reverts commit 1c2a4f0820ff2272f993e6da28dcf8bcbbc3252a. --- src/gallium/drivers/r600/r600_pipe.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 0b20b20..de9c6a5 100644 --- 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) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
