Handle DEPTH_STENCIL_ATTACHMENT_BIT in VK -> AHB usage

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
Jason Macnak
2024-08-07 12:26:24 -07:00
committed by Marge Bot
parent 2f161c31e3
commit 3fca9f7123

View File

@@ -43,22 +43,29 @@ uint64_t getAndroidHardwareBufferUsageFromVkUsage(const VkImageCreateFlags vk_cr
const VkImageUsageFlags vk_usage) {
uint64_t ahw_usage = 0;
if (vk_usage & VK_IMAGE_USAGE_SAMPLED_BIT) ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
if (vk_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)
if (vk_usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
if (vk_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
}
if (vk_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
}
if (vk_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT;
if (vk_create & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT)
}
if (vk_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT;
}
if (vk_create & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP;
if (vk_create & VK_IMAGE_CREATE_PROTECTED_BIT)
}
if (vk_create & VK_IMAGE_CREATE_PROTECTED_BIT) {
ahw_usage |= AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT;
}
/* No usage bits set - set at least one GPU usage. */
if (ahw_usage == 0) ahw_usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
if (ahw_usage == 0) {
ahw_usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
}
return ahw_usage;
}