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

panfrost: Rename gtransfer to transfer 

Now that panfrost_transfer is renamed to panfrost_ptr.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7206>
This commit is contained in:
Alyssa Rosenzweig 2020-10-21 16:00:54 -04:00 committed by Marge Bot
parent 1b3b289c5c
commit 3f91d81945
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,7 +729,7 @@ pan_alloc_staging(struct panfrost_context *ctx, struct panfrost_resource *rsc,
} }
static void static void
pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans) pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_transfer *trans)
{ {
struct pipe_resource *dst = trans->base.resource; struct pipe_resource *dst = trans->base.resource;
struct pipe_blit_info blit = {0}; struct pipe_blit_info blit = {0};
@ -749,7 +749,7 @@ pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_gtransfer *tran
} }
static void static void
pan_blit_to_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans) pan_blit_to_staging(struct pipe_context *pctx, struct panfrost_transfer *trans)
{ {
struct pipe_resource *src = trans->base.resource; struct pipe_resource *src = trans->base.resource;
struct pipe_blit_info blit = {0}; struct pipe_blit_info blit = {0};
@ -786,7 +786,7 @@ panfrost_ptr_map(struct pipe_context *pctx,
if ((usage & PIPE_MAP_DIRECTLY) && rsrc->modifier != DRM_FORMAT_MOD_LINEAR) if ((usage & PIPE_MAP_DIRECTLY) && rsrc->modifier != DRM_FORMAT_MOD_LINEAR)
return NULL; return NULL;
struct panfrost_gtransfer *transfer = rzalloc(pctx, struct panfrost_gtransfer); struct panfrost_transfer *transfer = rzalloc(pctx, struct panfrost_transfer);
transfer->base.level = level; transfer->base.level = level;
transfer->base.usage = usage; transfer->base.usage = usage;
transfer->base.box = *box; transfer->base.box = *box;
@ -984,7 +984,7 @@ panfrost_ptr_unmap(struct pipe_context *pctx,
{ {
/* Gallium expects writeback here, so we tile */ /* Gallium expects writeback here, so we tile */
struct panfrost_gtransfer *trans = pan_transfer(transfer); struct panfrost_transfer *trans = pan_transfer(transfer);
struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource; struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
struct panfrost_device *dev = pan_device(pctx->screen); struct panfrost_device *dev = pan_device(pctx->screen);

6
src/gallium/drivers/panfrost/pan_resource.h
View File

@ -82,7 +82,7 @@ pan_resource(struct pipe_resource *p)
return (struct panfrost_resource *)p; return (struct panfrost_resource *)p;
} }
struct panfrost_gtransfer { struct panfrost_transfer {
struct pipe_transfer base; struct pipe_transfer base;
void *map; void *map;
struct { struct {
@ -91,10 +91,10 @@ struct panfrost_gtransfer {
} staging; } staging;
}; };
static inline struct panfrost_gtransfer * static inline struct panfrost_transfer *
pan_transfer(struct pipe_transfer *p) pan_transfer(struct pipe_transfer *p)
{ {
return (struct panfrost_gtransfer *)p; return (struct panfrost_transfer *)p;
} }
mali_ptr mali_ptr