diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-02-25 23:42:59 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-03-09 15:02:26 +0100 |
| commit | ecbd3aba1769b673b6c671762a68af812bbab815 (patch) | |
| tree | 94232b17f4e3a575c99f7c8512869e1c08873df6 /src/gallium/drivers/radeon/r600_buffer_common.c | |
| parent | afdaffcbdb35e326e06d458c01a31a4e262ace24 (diff) | |
| download | external_mesa3d-ecbd3aba1769b673b6c671762a68af812bbab815.zip external_mesa3d-ecbd3aba1769b673b6c671762a68af812bbab815.tar.gz external_mesa3d-ecbd3aba1769b673b6c671762a68af812bbab815.tar.bz2 | |
gallium/radeon: if we can't discard a whole resource, discard the range instead
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_buffer_common.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index fb3a80e..70c8eb2 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -312,13 +312,17 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, if (r600_invalidate_buffer(rctx, rbuffer)) { /* At this point, the buffer is always idle. */ usage |= PIPE_TRANSFER_UNSYNCHRONIZED; + } else { + /* Fall back to a temporary buffer. */ + usage |= PIPE_TRANSFER_DISCARD_RANGE; } } - else if ((usage & PIPE_TRANSFER_DISCARD_RANGE) && - !(usage & (PIPE_TRANSFER_UNSYNCHRONIZED | - PIPE_TRANSFER_PERSISTENT)) && - !(rscreen->debug_flags & DBG_NO_DISCARD_RANGE) && - r600_can_dma_copy_buffer(rctx, box->x, 0, box->width)) { + + if ((usage & PIPE_TRANSFER_DISCARD_RANGE) && + !(usage & (PIPE_TRANSFER_UNSYNCHRONIZED | + PIPE_TRANSFER_PERSISTENT)) && + !(rscreen->debug_flags & DBG_NO_DISCARD_RANGE) && + r600_can_dma_copy_buffer(rctx, box->x, 0, box->width)) { assert(usage & PIPE_TRANSFER_WRITE); /* Check if mapping this buffer would cause waiting for the GPU. */ |