Mesa (master): venus: remove VN_SYNC_TYPE_SYNC

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b6d819c3481d72330957c50515d0a51e6883e01f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6d819c3481d72330957c50515d0a51e6883e01f

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Apr  2 09:48:25 2021 -0700

venus: remove VN_SYNC_TYPE_SYNC

It is unused now.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei at chromium.org>
Reviewed-by: Ryan Neph <ryanneph at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10146>

---

 src/virtio/vulkan/vn_queue.c | 53 --------------------------------------------
 src/virtio/vulkan/vn_queue.h | 10 +--------
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c
index ac09dcd5d50..f1c0600e4d1 100644
--- a/src/virtio/vulkan/vn_queue.c
+++ b/src/virtio/vulkan/vn_queue.c
@@ -440,9 +440,6 @@ static void
 vn_sync_payload_release(struct vn_device *dev,
                         struct vn_sync_payload *payload)
 {
-   if (payload->type == VN_SYNC_TYPE_SYNC)
-      vn_renderer_sync_release(payload->sync);
-
    payload->type = VN_SYNC_TYPE_INVALID;
 }
 
@@ -452,28 +449,8 @@ vn_fence_init_payloads(struct vn_device *dev,
                        bool signaled,
                        const VkAllocationCallbacks *alloc)
 {
-   struct vn_renderer_sync *perm_sync;
-   VkResult result =
-      vn_renderer_sync_create_empty(dev->instance->renderer, &perm_sync);
-   if (result != VK_SUCCESS)
-      return result;
-
-   struct vn_renderer_sync *temp_sync;
-   result =
-      vn_renderer_sync_create_empty(dev->instance->renderer, &temp_sync);
-   if (result != VK_SUCCESS) {
-      vn_renderer_sync_destroy(perm_sync);
-      return result;
-   }
-
-   /* perm_sync is unused */
    fence->permanent.type = VN_SYNC_TYPE_DEVICE_ONLY;
-   fence->permanent.sync = perm_sync;
-
-   /* temp_sync is uninitialized */
    fence->temporary.type = VN_SYNC_TYPE_INVALID;
-   fence->temporary.sync = temp_sync;
-
    fence->payload = &fence->permanent;
 
    return VK_SUCCESS;
@@ -546,8 +523,6 @@ vn_DestroyFence(VkDevice device,
 
    vn_sync_payload_release(dev, &fence->permanent);
    vn_sync_payload_release(dev, &fence->temporary);
-   vn_renderer_sync_destroy(fence->permanent.sync);
-   vn_renderer_sync_destroy(fence->temporary.sync);
 
    vn_object_base_fini(&fence->base);
    vk_free(alloc, fence);
@@ -716,28 +691,8 @@ vn_semaphore_init_payloads(struct vn_device *dev,
                            uint64_t initial_val,
                            const VkAllocationCallbacks *alloc)
 {
-   struct vn_renderer_sync *perm_sync;
-   VkResult result =
-      vn_renderer_sync_create_empty(dev->instance->renderer, &perm_sync);
-   if (result != VK_SUCCESS)
-      return result;
-
-   struct vn_renderer_sync *temp_sync;
-   result =
-      vn_renderer_sync_create_empty(dev->instance->renderer, &temp_sync);
-   if (result != VK_SUCCESS) {
-      vn_renderer_sync_destroy(perm_sync);
-      return result;
-   }
-
-   /* perm_sync is unused */
    sem->permanent.type = VN_SYNC_TYPE_DEVICE_ONLY;
-   sem->permanent.sync = perm_sync;
-
-   /* temp_sync is uninitialized */
    sem->temporary.type = VN_SYNC_TYPE_INVALID;
-   sem->temporary.sync = temp_sync;
-
    sem->payload = &sem->permanent;
 
    return VK_SUCCESS;
@@ -750,7 +705,6 @@ vn_semaphore_reset_wsi(struct vn_device *dev, struct vn_semaphore *sem)
 
    vn_sync_payload_release(dev, &sem->temporary);
 
-   assert(perm->type != VN_SYNC_TYPE_SYNC);
    sem->payload = perm;
 }
 
@@ -823,8 +777,6 @@ vn_DestroySemaphore(VkDevice device,
 
    vn_sync_payload_release(dev, &sem->permanent);
    vn_sync_payload_release(dev, &sem->temporary);
-   vn_renderer_sync_destroy(sem->permanent.sync);
-   vn_renderer_sync_destroy(sem->temporary.sync);
 
    vn_object_base_fini(&sem->base);
    vk_free(alloc, sem);
@@ -848,9 +800,6 @@ VkResult
 vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo)
 {
    struct vn_device *dev = vn_device_from_handle(device);
-   struct vn_semaphore *sem =
-      vn_semaphore_from_handle(pSignalInfo->semaphore);
-   struct vn_sync_payload *payload = sem->payload;
 
    /* TODO if the semaphore is shared-by-ref, this needs to be synchronous */
    if (false)
@@ -858,8 +807,6 @@ vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo)
    else
       vn_async_vkSignalSemaphore(dev->instance, device, pSignalInfo);
 
-   assert(payload->type != VN_SYNC_TYPE_SYNC);
-
    return VK_SUCCESS;
 }
 
diff --git a/src/virtio/vulkan/vn_queue.h b/src/virtio/vulkan/vn_queue.h
index 5d97ef471f7..5bdb7abe9f2 100644
--- a/src/virtio/vulkan/vn_queue.h
+++ b/src/virtio/vulkan/vn_queue.h
@@ -31,14 +31,7 @@ enum vn_sync_type {
    /* no payload */
    VN_SYNC_TYPE_INVALID,
 
-   /* When we signal or reset, we update both the device object and the
-    * renderer sync.  When we wait or query, we use the renderer sync only.
-    *
-    * TODO VkFence does not need the device object
-    */
-   VN_SYNC_TYPE_SYNC,
-
-   /* device object only; no renderer sync */
+   /* device object */
    VN_SYNC_TYPE_DEVICE_ONLY,
 
    /* already signaled by WSI */
@@ -47,7 +40,6 @@ enum vn_sync_type {
 
 struct vn_sync_payload {
    enum vn_sync_type type;
-   struct vn_renderer_sync *sync;
 };
 
 struct vn_fence {