diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index 90bc7908ed3..1d5e63f8c41 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -52,17 +52,6 @@ vk_format_from_android(unsigned android_format, unsigned android_usage) } } -unsigned -anv_ahb_format_for_vk_format(VkFormat vk_format) -{ - switch (vk_format) { - case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: - return AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420; - default: - return vk_image_format_to_ahb_format(vk_format); - } -} - static VkResult get_ahw_buffer_format_properties2( VkDevice device_h, diff --git a/src/intel/vulkan/anv_android.h b/src/intel/vulkan/anv_android.h index 1657a2fcf76..468cd464235 100644 --- a/src/intel/vulkan/anv_android.h +++ b/src/intel/vulkan/anv_android.h @@ -49,8 +49,6 @@ VkResult anv_image_init_from_gralloc(struct anv_device *device, const VkImageCreateInfo *base_info, const VkNativeBufferANDROID *gralloc_info); -unsigned anv_ahb_format_for_vk_format(VkFormat vk_format); - VkResult anv_import_ahw_memory(VkDevice device_h, struct anv_device_memory *mem); diff --git a/src/intel/vulkan/anv_android_stubs.c b/src/intel/vulkan/anv_android_stubs.c index de08973bd42..12cc2845e9c 100644 --- a/src/intel/vulkan/anv_android_stubs.c +++ b/src/intel/vulkan/anv_android_stubs.c @@ -40,11 +40,6 @@ anv_image_init_from_gralloc(struct anv_device *device, return VK_ERROR_EXTENSION_NOT_PRESENT; } -unsigned anv_ahb_format_for_vk_format(VkFormat vk_format) -{ - return 0; -} - VkResult anv_import_ahw_memory(VkDevice device_h, struct anv_device_memory *mem) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index a71469f9737..6d145d68d6e 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1680,9 +1680,6 @@ anv_image_init(struct anv_device *device, struct anv_image *image, if (image->vk.external_handle_types & VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) { image->from_ahb = true; -#if DETECT_OS_ANDROID - image->vk.ahb_format = anv_ahb_format_for_vk_format(image->vk.format); -#endif return VK_SUCCESS; }