OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Switch to lima tiling

Browse Source 
Lima and Panfrost both have implementations of software tiling
(the Lima one was forked off the Panfrost one which was forked off the
original Lima one...). Switch to the most recent Lima code, since it's
more complete than ours at this point.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-06-18 10:43:07 -07:00
parent 7b46f09f26
commit 035a07c0ae
5 changed files with 11 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,8 @@
#include "pan_context.h"
#include "pan_screen.h"
#include "pan_resource.h"
#include "pan_swizzle.h"
#include "pan_util.h"
#include "pan_tiling.h"
static struct pipe_resource *
panfrost_resource_from_handle(struct pipe_screen *pscreen,
@@ -523,33 +523,10 @@ panfrost_transfer_map(struct pipe_context *pctx,
}
}
static void
panfrost_tile_texture(struct panfrost_screen *screen, struct panfrost_resource *rsrc, struct panfrost_gtransfer *trans)
{
struct panfrost_bo *bo = (struct panfrost_bo *)rsrc->bo;
unsigned level = trans->base.level;
panfrost_texture_swizzle(
trans->base.box.x,
trans->base.box.y,
trans->base.box.width,
trans->base.box.height,
util_format_get_blocksize(rsrc->base.format),
u_minify(rsrc->base.width0, level),
trans->map,
bo->cpu
+ bo->slices[level].offset
+ bo->cubemap_stride * trans->base.box.z
);
}
static void
panfrost_transfer_unmap(struct pipe_context *pctx,
struct pipe_transfer *transfer)
{
struct panfrost_context *ctx = pan_context(pctx);
/* Gallium expects writeback here, so we tile */
struct panfrost_gtransfer *trans = pan_transfer(transfer);
@@ -563,10 +540,16 @@ panfrost_transfer_unmap(struct pipe_context *pctx,
if (bo->layout == PAN_AFBC) {
DBG("Unimplemented: writes to AFBC\n");
} else if (bo->layout == PAN_TILED) {
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
unsigned level = transfer->level;
assert(transfer->box.depth == 1);
panfrost_tile_texture(screen, prsrc, trans);
panfrost_store_tiled_image(
bo->cpu + bo->slices[level].offset,
trans->map,
&transfer->box,
bo->slices[level].stride,
transfer->stride,
util_format_get_blocksize(prsrc->base.format));
}
}
}