commit 3f91d819450386676ab7997b5c50320c3f248135
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Wed Oct 21 16:00:54 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Fri Oct 23 14:48:22 2020 +0000
tree 77e8c1dcd5c437210543385d9e506c4b2a408ae9
parent 1b3b289c5c1e996bdb3640dfcfaa516e16da7d0d

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>

src/gallium/drivers/panfrost/pan_resource.c

diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 810ec67..54e8cc5 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -729,7 +729,7 @@
 }
 
 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_blit_info blit = {0};
@@ -749,7 +749,7 @@
 }
 
 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_blit_info blit = {0};
@@ -786,7 +786,7 @@
         if ((usage & PIPE_MAP_DIRECTLY) && rsrc->modifier != DRM_FORMAT_MOD_LINEAR)
                 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.usage = usage;
         transfer->base.box = *box;
@@ -984,7 +984,7 @@
 {
         /* 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_device *dev = pan_device(pctx->screen);
 

src/gallium/drivers/panfrost/pan_resource.h

diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h
index 009f13c..121a7ab 100644
--- a/src/gallium/drivers/panfrost/pan_resource.h
+++ b/src/gallium/drivers/panfrost/pan_resource.h
@@ -82,7 +82,7 @@
         return (struct panfrost_resource *)p;
 }
 
-struct panfrost_gtransfer {
+struct panfrost_transfer {
         struct pipe_transfer base;
         void *map;
         struct {
@@ -91,10 +91,10 @@
         } staging;
 };
 
-static inline struct panfrost_gtransfer *
+static inline struct panfrost_transfer *
 pan_transfer(struct pipe_transfer *p)
 {
-        return (struct panfrost_gtransfer *)p;
+        return (struct panfrost_transfer *)p;
 }
 
 mali_ptr