From 25a206b9ac22eab54bdd17022736bfa6fb1d1869 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 21 May 2024 07:47:27 -0700 Subject: [PATCH] tu: Don't advertise AHB handle time on non-android Fixes dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image.info among others. Fixes: 99753001f35a ("turnip: Support AHardwareBuffer") Signed-off-by: Rob Clark Part-of: --- src/freedreno/vulkan/tu_formats.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/freedreno/vulkan/tu_formats.cc b/src/freedreno/vulkan/tu_formats.cc index 9bad9df3f79..9552a993ff3 100644 --- a/src/freedreno/vulkan/tu_formats.cc +++ b/src/freedreno/vulkan/tu_formats.cc @@ -689,12 +689,14 @@ tu_get_external_image_format_properties( handleType, pImageFormatInfo->type); } break; +#if DETECT_OS_ANDROID case VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID: flags = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT; compat_flags = export_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID; break; +#endif case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT: flags = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT; compat_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT;