From 6775873e9ec87cb38f3420b73b4b6a8ebdd0b612 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Tue, 5 Aug 2025 18:57:20 +0000
Subject: [PATCH] venus/android: clean up leftovers from common AHB helpers
 adoption

This is a follow up for:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36388.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36581>
---
 src/virtio/vulkan/vn_android.c |  2 +-
 src/virtio/vulkan/vn_android.h | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c
index 3f29182d69d..2caa597f262 100644
--- a/src/virtio/vulkan/vn_android.c
+++ b/src/virtio/vulkan/vn_android.c
@@ -113,7 +113,7 @@ vn_android_gralloc_get_dma_buf_fd(const native_handle_t *handle)
    return handle->data[0];
 }
 
-const VkFormat *
+static const VkFormat *
 vn_android_format_to_view_formats(VkFormat format, uint32_t *out_count)
 {
    /* For AHB image prop query and creation, venus overrides the tiling to
diff --git a/src/virtio/vulkan/vn_android.h b/src/virtio/vulkan/vn_android.h
index b3e7a436cc7..386a8979455 100644
--- a/src/virtio/vulkan/vn_android.h
+++ b/src/virtio/vulkan/vn_android.h
@@ -30,13 +30,6 @@ struct vn_device_memory *
 vn_android_get_wsi_memory_from_bind_info(
    struct vn_device *dev, const VkBindImageMemoryInfo *bind_info);
 
-const VkFormat *
-vn_android_format_to_view_formats(VkFormat format, uint32_t *out_count);
-
-uint64_t
-vn_android_get_ahb_usage(const VkImageUsageFlags usage,
-                         const VkImageCreateFlags flags);
-
 VkResult
 vn_android_device_import_ahb(struct vn_device *dev,
                              struct vn_device_memory *mem,
@@ -62,20 +55,6 @@ vn_android_get_wsi_memory_from_bind_info(
    return NULL;
 }
 
-static inline const VkFormat *
-vn_android_format_to_view_formats(UNUSED VkFormat format,
-                                  UNUSED uint32_t *out_count)
-{
-   return NULL;
-}
-
-static inline uint64_t
-vn_android_get_ahb_usage(UNUSED const VkImageUsageFlags usage,
-                         UNUSED const VkImageCreateFlags flags)
-{
-   return 0;
-}
-
 static inline VkResult
 vn_android_device_import_ahb(
    UNUSED struct vn_device *dev,
@@ -85,12 +64,6 @@ vn_android_device_import_ahb(
    return VK_ERROR_OUT_OF_HOST_MEMORY;
 }
 
-static inline uint32_t
-vn_android_get_ahb_buffer_memory_type_bits(UNUSED struct vn_device *dev)
-{
-   return 0;
-}
-
 #endif /* DETECT_OS_ANDROID */
 
 #endif /* VN_ANDROID_H */