From: Grigori Goronzy Date: Sun, 13 Oct 2013 16:08:44 +0000 (+0200) Subject: radeon: use staging for mapping linear textures X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f250fd59c4e39e55816eb0bacce30c14240b58c4;p=mesa.git radeon: use staging for mapping linear textures Textures that likely reside in VRAM, are mapped for reading and don't require direct mapping should be staged into GTT, to avoid bad performance. This fixes readback performance of VDPAU surfaces. Reviewed-by: Marek Olšák --- diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index ebb7090697d..9ba1e363e27 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -852,6 +852,12 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, if (rtex->surface.level[level].mode >= RADEON_SURF_MODE_1D) use_staging_texture = TRUE; + /* Untiled buffers in VRAM, which is slow for CPU reads */ + if ((usage & PIPE_TRANSFER_READ) && !(usage & PIPE_TRANSFER_MAP_DIRECTLY) && + (rtex->resource.domains == RADEON_DOMAIN_VRAM)) { + use_staging_texture = TRUE; + } + /* Use a staging texture for uploads if the underlying BO is busy. */ if (!(usage & PIPE_TRANSFER_READ) && (r600_rings_is_buffer_referenced(rctx, rtex->resource.cs_buf, RADEON_USAGE_READWRITE) ||