diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-05-12 12:55:41 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-05-19 12:35:50 +0200 |
| commit | 5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee (patch) | |
| tree | 5a0bbb39ba7c404a610f2f7e1d0920d8e7b5e6ef /src/gallium/drivers/radeon/r600_texture.c | |
| parent | 51cf04cf0e4b348de7e920deff1dad3fb4e62407 (diff) | |
| download | external_mesa3d-5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee.zip external_mesa3d-5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee.tar.gz external_mesa3d-5e14d0ac2c1abc46c5ae9081fcce5508dc7a24ee.tar.bz2 | |
gallium/radeon: ignore PIPE_TRANSFER_MAP_DIRECTLY
Only st/xa is using this, which is irrelevant to us.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 6 |
1 files changed, 1 insertions, 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; |