From e8a61a8a6bee80f7fb63217fc82500439cd98c3d Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sat, 16 Sep 2023 15:07:15 -0700 Subject: [PATCH] vulkan/android: drop vk_buffer dependency from common AHB impl Unlike AHB image, the spec has ensured no special treatment for allocationSize for AHB buffer export operation. Signed-off-by: Yiwei Zhang Reviewed-by: Chia-I Wu Part-of: --- src/vulkan/runtime/vk_android.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/vulkan/runtime/vk_android.c b/src/vulkan/runtime/vk_android.c index dc07966c3da..df4efae1b5f 100644 --- a/src/vulkan/runtime/vk_android.c +++ b/src/vulkan/runtime/vk_android.c @@ -23,7 +23,6 @@ #include "vk_android.h" -#include "vk_buffer.h" #include "vk_common_entrypoints.h" #include "vk_device.h" #include "vk_image.h" @@ -194,14 +193,9 @@ vk_alloc_ahardware_buffer(const VkMemoryAllocateInfo *pAllocateInfo) format = image->ahb_format; usage = vk_image_usage_to_ahb_usage(image->create_flags, image->usage); - } else if (dedicated_info && dedicated_info->buffer) { - VK_FROM_HANDLE(vk_buffer, buffer, dedicated_info->buffer); - w = buffer->size; - format = AHARDWAREBUFFER_FORMAT_BLOB; - usage = AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER | - AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN | - AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN; } else { + /* AHB export allocation for VkBuffer requires a valid allocationSize */ + assert(pAllocateInfo->allocationSize); w = pAllocateInfo->allocationSize; format = AHARDWAREBUFFER_FORMAT_BLOB; usage = AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER |