diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-02-08 12:09:29 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-02-08 14:48:12 +0100 |
| commit | d8d5c2660f581821f017fdcb7954c6f7bd099114 (patch) | |
| tree | b77ae81cf551b5648afb5e9b3bda1cf06b706c6a /src/gallium/drivers/r600 | |
| parent | 4d78dafc84d460d1db52eac7b0ff041700bb435e (diff) | |
Revert "r600g: do not flush the uploader" (with comments)
This reverts commit 1c2a4f0820ff2272f993e6da28dcf8bcbbc3252a.
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | 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 0b20b207dc..de9c6a52e1 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) |