gallium/radeon: ignore PIPE_TRANSFER_MAP_DIRECTLY
authorMarek Olšák <marek.olsak@amd.com>
Thu, 12 May 2016 10:55:41 +0000 (12:55 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 19 May 2016 10:35:50 +0000 (12:35 +0200)
Only st/xa is using this, which is irrelevant to us.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeon/r600_texture.c

index c89afbc..b22fca8 100644 (file)
@@ -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;