From 0e77de00e3f6306489d49689d9fb05d8d9aa71f7 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Mon, 16 Jun 2025 01:20:18 -0700
Subject: [PATCH] lvp: drop explicit u_gralloc init

u_gralloc will be initialized upon the initial vk_android_get_ugralloc.

Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35561>
---
 src/gallium/frontends/lavapipe/lvp_device.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index 86cf4a2ac26..546db4377ec 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -1401,10 +1401,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateInstance(
 
    //   VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false));
 
-#if DETECT_OS_ANDROID
-   vk_android_init_ugralloc();
-#endif
-
    *pInstance = lvp_instance_to_handle(instance);
 
    return VK_SUCCESS;
@@ -1419,10 +1415,6 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroyInstance(
    if (!instance)
       return;
 
-#if DETECT_OS_ANDROID
-   vk_android_destroy_ugralloc();
-#endif
-
    pipe_loader_release(&instance->devs, instance->num_devices);
 
    vk_instance_finish(&instance->vk);