OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/android: drop vk_buffer dependency from common AHB impl

Browse Source 
Unlike AHB image, the spec has ensured no special treatment for
allocationSize for AHB buffer export operation.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25263>
This commit is contained in:
Yiwei Zhang
2023-09-16 15:07:15 -07:00
committed by Marge Bot
parent cd0b86fce1
commit e8a61a8a6b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vulkan/runtime/vk_android.c
View File

@@ -23,7 +23,6 @@
#include "vk_android.h" #include "vk_android.h"
#include "vk_buffer.h"
#include "vk_common_entrypoints.h" #include "vk_common_entrypoints.h"
#include "vk_device.h" #include "vk_device.h"
#include "vk_image.h" #include "vk_image.h"
@@ -194,14 +193,9 @@ vk_alloc_ahardware_buffer(const VkMemoryAllocateInfo *pAllocateInfo)
format = image->ahb_format; format = image->ahb_format;
usage = vk_image_usage_to_ahb_usage(image->create_flags, usage = vk_image_usage_to_ahb_usage(image->create_flags,
image->usage); 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 { } else {
/* AHB export allocation for VkBuffer requires a valid allocationSize */
assert(pAllocateInfo->allocationSize);
w = pAllocateInfo->allocationSize; w = pAllocateInfo->allocationSize;
format = AHARDWAREBUFFER_FORMAT_BLOB; format = AHARDWAREBUFFER_FORMAT_BLOB;
usage = AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER | usage = AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER |