Mesa (main): turnip: Use vk_common_AcquireImageANDROID

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5b8b6315e4c08e9553384e57cbf5de2b6653f2d2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b8b6315e4c08e9553384e57cbf5de2b6653f2d2

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Sat Jan  1 23:10:31 2022 -0600

turnip: Use vk_common_AcquireImageANDROID

It's got some bug fixes that turnip never picked up.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Reviewed-by: Hyunjun Ko <zzoon at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14411>

---

 src/freedreno/vulkan/tu_android.c | 40 ---------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c
index e285c1e7b9f..e526ddd371f 100644
--- a/src/freedreno/vulkan/tu_android.c
+++ b/src/freedreno/vulkan/tu_android.c
@@ -471,43 +471,3 @@ tu_GetSwapchainGrallocUsage2ANDROID(VkDevice device_h,
    return VK_SUCCESS;
 }
 #endif
-
-VKAPI_ATTR VkResult VKAPI_CALL
-tu_AcquireImageANDROID(VkDevice device,
-                       VkImage image_h,
-                       int nativeFenceFd,
-                       VkSemaphore semaphore,
-                       VkFence fence)
-{
-   VkResult semaphore_result = VK_SUCCESS, fence_result = VK_SUCCESS;
-
-   if (semaphore != VK_NULL_HANDLE) {
-      int semaphore_fd =
-         nativeFenceFd >= 0 ? os_dupfd_cloexec(nativeFenceFd) : nativeFenceFd;
-      semaphore_result = tu_ImportSemaphoreFdKHR(
-         device, &(VkImportSemaphoreFdInfoKHR) {
-                    .sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
-                    .flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT,
-                    .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
-                    .fd = semaphore_fd,
-                    .semaphore = semaphore,
-                 });
-   }
-
-   if (fence != VK_NULL_HANDLE) {
-      int fence_fd = nativeFenceFd >= 0 ? os_dupfd_cloexec(nativeFenceFd) : nativeFenceFd;
-      fence_result = tu_ImportFenceFdKHR(
-         device, &(VkImportFenceFdInfoKHR) {
-                    .sType = VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR,
-                    .flags = VK_FENCE_IMPORT_TEMPORARY_BIT,
-                    .fd = fence_fd,
-                    .fence = fence,
-                 });
-   }
-
-   close(nativeFenceFd);
-
-   if (semaphore_result != VK_SUCCESS)
-      return semaphore_result;
-   return fence_result;
-}