Module: Mesa Branch: master Commit: 5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee
Author: Marek Olšák <[email protected]> Date: Thu May 12 12:55:41 2016 +0200 gallium/radeon: ignore PIPE_TRANSFER_MAP_DIRECTLY Only st/xa is using this, which is irrelevant to us. Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeon/r600_texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index c89afbc..b22fca8 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1246,7 +1246,7 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, */ if (rtex->surface.level[0].mode >= RADEON_SURF_MODE_1D) { use_staging_texture = TRUE; - } else if ((usage & PIPE_TRANSFER_READ) && !(usage & PIPE_TRANSFER_MAP_DIRECTLY) && + } else if ((usage & PIPE_TRANSFER_READ) && (rtex->resource.domains == RADEON_DOMAIN_VRAM)) { /* Untiled buffers in VRAM, which is slow for CPU reads */ use_staging_texture = TRUE; @@ -1261,10 +1261,6 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, use_staging_texture = FALSE; } - if (use_staging_texture && (usage & PIPE_TRANSFER_MAP_DIRECTLY)) { - return NULL; - } - trans = CALLOC_STRUCT(r600_transfer); if (!trans) return NULL; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
