Mesa (main): panvk: Remove unused layout structs

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue May 3 14:38:09 UTC 2022


Module: Mesa
Branch: main
Commit: a7fdedd247ca6ae66011c7d74894d3c2aaaac340
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7fdedd247ca6ae66011c7d74894d3c2aaaac340

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Wed Apr 27 11:40:44 2022 -0400

panvk: Remove unused layout structs

PanVK switched to the common Panfrost layout code, but these duplicate structs
stuck around. Garbage collect them to prevent confusion.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16201>

---

 src/panfrost/vulkan/panvk_private.h | 43 -------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h
index 350068542b5..105b1f5a43a 100644
--- a/src/panfrost/vulkan/panvk_private.h
+++ b/src/panfrost/vulkan/panvk_private.h
@@ -937,49 +937,6 @@ struct panvk_pipeline {
    VkRect2D scissor;
 };
 
-struct panvk_image_level {
-   VkDeviceSize offset;
-   VkDeviceSize size;
-   uint32_t pitch;
-};
-
-struct panvk_slice_layout {
-   unsigned width;
-   unsigned height;
-   unsigned depth;
-   unsigned offset;
-   unsigned line_stride;
-   unsigned size;
-
-   /* If there is a header preceding each slice, how big is
-    * that header? Used for AFBC.
-    */
-   unsigned afbc_header_size;
-
-   /* If checksumming is enabled following the slice, what
-    * is its offset/stride?
-    */
-   struct {
-      unsigned offset;
-      unsigned stride;
-      unsigned size;
-   } checksum;
-};
-
-#define PANVK_MAX_MIP_LEVELS 13
-
-struct panvk_plane_layout {
-   struct panvk_slice_layout slices[PANVK_MAX_MIP_LEVELS];
-   unsigned offset;
-   unsigned array_stride;
-   unsigned size;
-};
-
-struct panvk_plane_memory {
-   const struct panfrost_bo *bo;
-   unsigned offset;
-};
-
 #define PANVK_MAX_PLANES 1
 
 struct panvk_image {



More information about the mesa-commit mailing list