From 7934c9ab780d894ae07f5bfbbdb72e51cc1b30a5 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Tue, 15 Jul 2025 23:30:57 +0000 Subject: [PATCH] vulkan/android: make vk_ahb_probe_format private to android runtime ...and drop duplicate docs. Acked-by: Rob Clark Part-of: --- src/vulkan/runtime/vk_android.c | 7 +------ src/vulkan/runtime/vk_android.h | 12 ------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/vulkan/runtime/vk_android.c b/src/vulkan/runtime/vk_android.c index b07fb83953b..4a9b143c225 100644 --- a/src/vulkan/runtime/vk_android.c +++ b/src/vulkan/runtime/vk_android.c @@ -635,12 +635,7 @@ vk_image_usage_to_ahb_usage(const VkImageCreateFlags vk_create, return ahb_usage; } -/* Probe gralloc implementation to test whether it can allocate a buffer - * for the given format and usage. Vk drivers must not advertise support - * for AHB backed VkImage's if the gralloc implementation is not able to - * perform the allocation. - */ -bool +static bool vk_ahb_probe_format(VkFormat vk_format, VkImageCreateFlags vk_create, VkImageUsageFlags vk_usage) diff --git a/src/vulkan/runtime/vk_android.h b/src/vulkan/runtime/vk_android.h index a5fb408e5fe..fb703cb7d3f 100644 --- a/src/vulkan/runtime/vk_android.h +++ b/src/vulkan/runtime/vk_android.h @@ -92,10 +92,6 @@ uint32_t vk_image_format_to_ahb_format(VkFormat vk_format); uint64_t vk_image_usage_to_ahb_usage(const VkImageCreateFlags vk_create, const VkImageUsageFlags vk_usage); -bool vk_ahb_probe_format(VkFormat vk_format, - VkImageCreateFlags vk_create, - VkImageUsageFlags vk_usage); - struct AHardwareBuffer *vk_alloc_ahardware_buffer( const VkMemoryAllocateInfo *pAllocateInfo); @@ -141,14 +137,6 @@ vk_image_usage_to_ahb_usage(const VkImageCreateFlags vk_create, return 0; } -static inline bool -vk_ahb_probe_format(VkFormat vk_format, - VkImageCreateFlags vk_create, - VkImageUsageFlags vk_usage) -{ - return false; -} - static inline struct AHardwareBuffer * vk_alloc_ahardware_buffer(const VkMemoryAllocateInfo *pAllocateInfo) {