From ca1d0333dba017cf09a44c5369258b0d71126c49 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Sat, 1 Jan 2022 23:08:48 -0600
Subject: [PATCH] v3dv: Use the common QueueSignalReleaseImageANDROID from RADV

This is an actual functional change as we now plumb through the sync FD
instead of doing a vkQueueSubmit and trusting in implicit sync.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Tested-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14372>
---
 src/broadcom/vulkan/v3dv_android.c | 36 ------------------------------
 1 file changed, 36 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_android.c b/src/broadcom/vulkan/v3dv_android.c
index 726ae554d45..5c037594ce6 100644
--- a/src/broadcom/vulkan/v3dv_android.c
+++ b/src/broadcom/vulkan/v3dv_android.c
@@ -423,39 +423,3 @@ v3dv_GetSwapchainGrallocUsage2ANDROID(
    return VK_SUCCESS;
 }
 #endif
-
-VkResult
-v3dv_QueueSignalReleaseImageANDROID(VkQueue queue,
-                                    uint32_t waitSemaphoreCount,
-                                    const VkSemaphore *pWaitSemaphores,
-                                    VkImage image,
-                                    int *pNativeFenceFd)
-{
-   VkResult result;
-
-   if (waitSemaphoreCount == 0)
-      goto done;
-
-   result = v3dv_QueueSubmit(
-      queue, 1,
-      &(VkSubmitInfo) {
-         .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-         .waitSemaphoreCount = 1,
-         .pWaitSemaphores = pWaitSemaphores,
-         .pWaitDstStageMask =
-            &(VkPipelineStageFlags) { VK_PIPELINE_STAGE_ALL_COMMANDS_BIT },
-      },
-      (VkFence) VK_NULL_HANDLE);
-   if (result != VK_SUCCESS)
-      return result;
-
-done:
-   if (pNativeFenceFd) {
-      /* We can rely implicit on sync because above we submitted all
-       * semaphores to the queue.
-       */
-      *pNativeFenceFd = -1;
-   }
-
-   return VK_SUCCESS;
-}