From edbefeb5b12192207539f14c345e44e909337aa9 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 16 Jun 2025 01:50:49 -0700 Subject: [PATCH] v3dv: drop explicit u_gralloc init u_gralloc will be initialized upon the initial vk_android_get_ugralloc. Acked-by: Rob Clark Part-of: --- src/broadcom/vulkan/v3dv_device.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 6509a3e007a..54e1c5a0e28 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -240,7 +240,8 @@ get_device_extensions(const struct v3dv_physical_device *device, .EXT_vertex_attribute_divisor = true, }; #if DETECT_OS_ANDROID - if (vk_android_get_ugralloc() != NULL) { + struct u_gralloc *gralloc = vk_android_get_ugralloc(); + if (gralloc && u_gralloc_get_type(gralloc) != U_GRALLOC_TYPE_FALLBACK) { ext->ANDROID_external_memory_android_hardware_buffer = true; ext->ANDROID_native_buffer = true; } @@ -614,16 +615,6 @@ v3dv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false)); -#if DETECT_OS_ANDROID - struct u_gralloc *u_gralloc = vk_android_init_ugralloc(); - - if (u_gralloc && u_gralloc_get_type(u_gralloc) == U_GRALLOC_TYPE_FALLBACK) { - mesa_logw( - "v3dv: Gralloc is not supported. Android extensions are disabled."); - vk_android_destroy_ugralloc(); - } -#endif - *pInstance = v3dv_instance_to_handle(instance); return VK_SUCCESS; @@ -682,10 +673,6 @@ v3dv_DestroyInstance(VkInstance _instance, if (!instance) return; -#if DETECT_OS_ANDROID - vk_android_destroy_ugralloc(); -#endif - VG(VALGRIND_DESTROY_MEMPOOL(instance)); vk_instance_finish(&instance->vk);