KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Extend tiling for cubemaps 

transfer_unmap now tiles for any tiled resource, not just TEXTURE_2D,
which should more than just cubemaps!

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig 2019-03-28 23:47:10 +00:00
parent c87f3ce97f
commit 01fce794dc
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gallium/drivers/panfrost/pan_resource.c
View File

@ -433,8 +433,6 @@ panfrost_tile_texture(struct panfrost_screen *screen, struct panfrost_resource *
unsigned level = trans->base.level;
assert(!trans->base.box.z);
panfrost_texture_swizzle(
trans->base.box.x,
trans->base.box.y,
@ -443,7 +441,10 @@ panfrost_tile_texture(struct panfrost_screen *screen, struct panfrost_resource *
util_format_get_blocksize(rsrc->base.format),
bo->slices[level].stride,
trans->map,
bo->cpu + bo->slices[level].offset);
bo->cpu
+ bo->slices[level].offset
+ bo->cubemap_stride * trans->base.box.z
);
}
static void
@ -454,17 +455,16 @@ panfrost_unmap_bo(struct panfrost_context *ctx,
struct panfrost_bo *bo = (struct panfrost_bo *)pan_resource(transfer->resource)->bo;
if (transfer->usage & PIPE_TRANSFER_WRITE) {
if (transfer->resource->target == PIPE_TEXTURE_2D) {
struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
/* Gallium thinks writeback happens here; instead, this is our cue to tile */
if (bo->layout == PAN_AFBC) {
DBG("Warning: writes to afbc surface can't possibly work out well for you...\n");
} else if (bo->layout == PAN_TILED) {
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
panfrost_tile_texture(screen, prsrc, trans);
}
/* Gallium thinks writeback happens here; instead, this is our cue to tile */
if (bo->layout == PAN_AFBC) {
DBG("Warning: writes to afbc surface can't possibly work out well for you...\n");
} else if (bo->layout == PAN_TILED) {
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
assert(transfer->box.depth == 1);
panfrost_tile_texture(screen, prsrc, trans);
}
}