From 64326d0be599ea162399386101fc6d87e37d70dd Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 16 Jun 2025 19:46:06 -0700 Subject: [PATCH] anv: use common vk_android_get_front_buffer_usage helper Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_android.c | 8 ++------ src/intel/vulkan/anv_physical_device.c | 10 +--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index 535f8093f5a..a2f837b28a6 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -584,12 +584,8 @@ VkResult anv_GetSwapchainGrallocUsage2ANDROID( *grallocConsumerUsage |= GRALLOC1_CONSUMER_USAGE_HWCOMPOSER; } - struct u_gralloc *gralloc = vk_android_get_ugralloc(); - if ((swapchainImageUsage & VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_ANDROID) && - gralloc) { - uint64_t front_rendering_usage = 0; - u_gralloc_get_front_rendering_usage(gralloc, &front_rendering_usage); - *grallocProducerUsage |= front_rendering_usage; + if (swapchainImageUsage & VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_ANDROID) { + *grallocProducerUsage |= vk_android_get_front_buffer_usage(); } return VK_SUCCESS; diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c index 7c856685dad..4cf67544427 100644 --- a/src/intel/vulkan/anv_physical_device.c +++ b/src/intel/vulkan/anv_physical_device.c @@ -1263,14 +1263,6 @@ get_properties(const struct anv_physical_device *pdevice, VkSampleCountFlags sample_counts = isl_device_get_sample_counts(&pdevice->isl_dev); -#if DETECT_OS_ANDROID - /* Used to fill struct VkPhysicalDevicePresentationPropertiesANDROID */ - uint64_t front_rendering_usage = 0; - struct u_gralloc *gralloc = vk_android_get_ugralloc(); - if (gralloc != NULL) - u_gralloc_get_front_rendering_usage(gralloc, &front_rendering_usage); -#endif /* DETECT_OS_ANDROID */ - struct anv_descriptor_limits desc_limits; get_device_descriptor_limits(pdevice, &desc_limits); @@ -2001,7 +1993,7 @@ get_properties(const struct anv_physical_device *pdevice, /* VK_ANDROID_native_buffer */ #if DETECT_OS_ANDROID { - props->sharedImage = front_rendering_usage ? VK_TRUE : VK_FALSE; + props->sharedImage = !!vk_android_get_front_buffer_usage(); } #endif /* DETECT_OS_ANDROID */