Mesa (master): vulkan/wsi: remove unused image_get_modifier

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jan 23 19:07:37 UTC 2020


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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue Jan 21 08:32:49 2020 -0500

vulkan/wsi: remove unused image_get_modifier

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Acked-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3485>

---

 src/freedreno/vulkan/tu_wsi.c | 16 ----------------
 src/vulkan/wsi/wsi_common.h   |  2 --
 2 files changed, 18 deletions(-)

diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c
index 7117f6766bd..b172ba15569 100644
--- a/src/freedreno/vulkan/tu_wsi.c
+++ b/src/freedreno/vulkan/tu_wsi.c
@@ -35,21 +35,6 @@ tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
    return tu_lookup_entrypoint_unchecked(pName);
 }
 
-static uint64_t
-tu_wsi_image_get_modifier(VkImage _image)
-{
-   TU_FROM_HANDLE(tu_image, image, _image);
-
-   if (!image->layout.tile_mode)
-      return DRM_FORMAT_MOD_LINEAR;
-
-   if (image->layout.ubwc_size)
-      return DRM_FORMAT_MOD_QCOM_COMPRESSED;
-
-   /* TODO invent a modifier for tiled but not UBWC buffers: */
-   return DRM_FORMAT_MOD_INVALID;
-}
-
 VkResult
 tu_wsi_init(struct tu_physical_device *physical_device)
 {
@@ -64,7 +49,6 @@ tu_wsi_init(struct tu_physical_device *physical_device)
       return result;
 
    physical_device->wsi_device.supports_modifiers = true;
-   physical_device->wsi_device.image_get_modifier = tu_wsi_image_get_modifier;
 
    return VK_SUCCESS;
 }
diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h
index 5c331e2a996..92121be8bda 100644
--- a/src/vulkan/wsi/wsi_common.h
+++ b/src/vulkan/wsi/wsi_common.h
@@ -111,8 +111,6 @@ struct wsi_device {
       bool strict_imageCount;
    } x11;
 
-   uint64_t (*image_get_modifier)(VkImage image);
-
    /* Signals the semaphore such that any wait on the semaphore will wait on
     * any reads or writes on the give memory object.  This is used to
     * implement the semaphore signal operation in vkAcquireNextImage.



More information about the mesa-commit mailing list