[PATCH 0/1] MR4: vkd3d: Remove unused field fence_destruction_cond.

[PATCH 1/1] vkd3d: Remove unused field fence_destruction_cond.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d/command.c       | 10 ----------
 libs/vkd3d/vkd3d_private.h |  1 -
 2 files changed, 11 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index e0201d5d..4ab25cc7 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -424,20 +424,11 @@ static HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
         return hresult_from_errno(rc);
     }

-    if ((rc = vkd3d_cond_init(&worker->fence_destruction_cond)))
-    {
-        ERR("Failed to initialize condition variable, error %d.\n", rc);
-        vkd3d_mutex_destroy(&worker->mutex);
-        vkd3d_cond_destroy(&worker->cond);
-        return hresult_from_errno(rc);
-    }
-
     if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance,
             vkd3d_fence_worker_main, worker, &worker->thread)))
     {
         vkd3d_mutex_destroy(&worker->mutex);
         vkd3d_cond_destroy(&worker->cond);
-        vkd3d_cond_destroy(&worker->fence_destruction_cond);
     }

return hr;
@@ -467,7 +458,6 @@ static HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,

vkd3d_mutex_destroy(&worker->mutex);
     vkd3d_cond_destroy(&worker->cond);
-    vkd3d_cond_destroy(&worker->fence_destruction_cond);

vkd3d_free(worker->fences);

diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index f00181a2..d2ab8857 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -346,7 +346,6 @@ struct vkd3d_fence_worker
     union vkd3d_thread_handle thread;
     struct vkd3d_mutex mutex;
     struct vkd3d_cond cond;
-    struct vkd3d_cond fence_destruction_cond;
     bool should_exit;

size_t fence_count;

[PATCH 0/1] MR4: vkd3d: Remove unused field fence_destruction_cond. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.