diff options
author | Marek Olšák <[email protected]> | 2016-02-25 23:39:42 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2016-03-08 20:08:52 +0100 |
commit | 3146014d5f0f68b3c7524257ca095f1b475d25f2 (patch) | |
tree | 7a2871855d3490e3e19f257a119c4b229ad7563c /src/gallium/drivers | |
parent | 14b18aba89026204043d2e0d441e6be0e1af4aca (diff) |
gallium/radeon: don't use temporary buffers for persistent mappings
Cc: 11.1 11.2 <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index b384baa9237..81409ced827 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -314,7 +314,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, } } else if ((usage & PIPE_TRANSFER_DISCARD_RANGE) && - !(usage & PIPE_TRANSFER_UNSYNCHRONIZED) && + !(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); @@ -341,7 +342,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, } /* Using a staging buffer in GTT for larger reads is much faster. */ else if ((usage & PIPE_TRANSFER_READ) && - !(usage & PIPE_TRANSFER_WRITE) && + !(usage & (PIPE_TRANSFER_WRITE | + PIPE_TRANSFER_PERSISTENT)) && rbuffer->domains == RADEON_DOMAIN_VRAM && r600_can_dma_copy_buffer(rctx, 0, box->x, box->width)) { struct r600_resource *staging; |