diff options
| author | Niels Ole Salscheider <[email protected]> | 2014-08-14 20:22:26 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-08-19 12:56:04 +0200 |
| commit | 5ae9bdafd4bd50c0a72abb7cca5f8407efcb4cba (patch) | |
| tree | 8e0b1ac2451fa8285fa6cc6792de2743ef2175f6 | |
| parent | 498dc676ea7efac9bce490006a4f5b7f81e9e458 (diff) | |
gallium/radeon: Do not use u_upload_mgr for buffer downloads
Instead create a staging texture with pipe_buffer_create and
PIPE_USAGE_STAGING.
u_upload_mgr sets the usage of its staging buffer to PIPE_USAGE_STREAM.
But since 150ac07b855b5c5f879bf6ce9ca421ccd1a6c938 CPU -> GPU streaming buffers
are created in VRAM. Therefore the staging texture (in VRAM) does not offer any
performance improvements for buffer downloads.
Signed-off-by: Niels Ole Salscheider <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Signed-off-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 22bc97e109d..ee05776aed4 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -303,26 +303,22 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, !(usage & PIPE_TRANSFER_WRITE) && rbuffer->domains == RADEON_DOMAIN_VRAM && r600_can_dma_copy_buffer(rctx, 0, box->x, box->width)) { - unsigned offset; - struct r600_resource *staging = NULL; - - u_upload_alloc(rctx->uploader, 0, - box->width + (box->x % R600_MAP_BUFFER_ALIGNMENT), - &offset, (struct pipe_resource**)&staging, (void**)&data); + struct r600_resource *staging; + staging = (struct r600_resource*) pipe_buffer_create( + ctx->screen, PIPE_BIND_TRANSFER_READ, PIPE_USAGE_STAGING, + box->width + (box->x % R600_MAP_BUFFER_ALIGNMENT)); if (staging) { - data += box->x % R600_MAP_BUFFER_ALIGNMENT; - /* Copy the VRAM buffer to the staging buffer. */ rctx->dma_copy(ctx, &staging->b.b, 0, - offset + box->x % R600_MAP_BUFFER_ALIGNMENT, + box->x % R600_MAP_BUFFER_ALIGNMENT, 0, 0, resource, level, box); - /* Just do the synchronization. The buffer is mapped already. */ - r600_buffer_map_sync_with_rings(rctx, staging, PIPE_TRANSFER_READ); + data = r600_buffer_map_sync_with_rings(rctx, staging, PIPE_TRANSFER_READ); + data += box->x % R600_MAP_BUFFER_ALIGNMENT; return r600_buffer_get_transfer(ctx, resource, level, usage, box, - ptransfer, data, staging, offset); + ptransfer, data, staging, 0); } } |