Giovanni Mascellani : vkd3d: Use a dedicated mutex to protect the blocked queues.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 8e087b0f17870c2f9637d6bf5adde547442159fa
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/8e087b0f17870c2f9637d6bf5adde5...

Author: Giovanni Mascellani 
Date:   Wed Feb  8 15:06:21 2023 +0100

vkd3d: Use a dedicated mutex to protect the blocked queues.

---

libs/vkd3d/command.c       | 8 ++++----
 libs/vkd3d/device.c        | 3 +++
 libs/vkd3d/vkd3d_private.h | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 9cf35831..158d0d9f 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -645,7 +645,7 @@ static HRESULT d3d12_device_add_blocked_command_queues(struct d3d12_device *devi
     if (count == 0)
         return S_OK;

-    vkd3d_mutex_lock(&device->mutex);
+    vkd3d_mutex_lock(&device->blocked_queues_mutex);

if ((i = ARRAY_SIZE(device->blocked_queues) - device->blocked_queue_count) < count)
     {
@@ -657,7 +657,7 @@ static HRESULT d3d12_device_add_blocked_command_queues(struct d3d12_device *devi
     for (i = 0; i < count; ++i)
         device->blocked_queues[device->blocked_queue_count++] = command_queues[i];

-    vkd3d_mutex_unlock(&device->mutex);
+    vkd3d_mutex_unlock(&device->blocked_queues_mutex);
     return hr;
 }

@@ -668,7 +668,7 @@ static HRESULT d3d12_device_flush_blocked_queues_once(struct d3d12_device *devic

*flushed_any = false;

-    vkd3d_mutex_lock(&device->mutex);
+    vkd3d_mutex_lock(&device->blocked_queues_mutex);

/* Flush any ops unblocked by a new pending value. These cannot be flushed
      * with the device locked, so move the queue pointers to a local array. */
@@ -676,7 +676,7 @@ static HRESULT d3d12_device_flush_blocked_queues_once(struct d3d12_device *devic
     memcpy(blocked_queues, device->blocked_queues, blocked_queue_count * sizeof(blocked_queues[0]));
     device->blocked_queue_count = 0;

-    vkd3d_mutex_unlock(&device->mutex);
+    vkd3d_mutex_unlock(&device->blocked_queues_mutex);

i = 0;
     while (i < blocked_queue_count)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 21dd17ea..d81adc55 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2462,6 +2462,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface)
     {
         const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;

+        vkd3d_mutex_destroy(&device->blocked_queues_mutex);
+
         vkd3d_private_store_destroy(&device->private_store);

vkd3d_cleanup_format_info(device);
@@ -4119,6 +4121,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device,
     vkd3d_time_domains_init(device);

device->blocked_queue_count = 0;
+    vkd3d_mutex_init(&device->blocked_queues_mutex);

for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i)
         vkd3d_mutex_init(&device->desc_mutex[i]);
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 9c7bed39..56677648 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1512,6 +1512,7 @@ struct d3d12_device
     unsigned int queue_family_count;
     VkTimeDomainEXT vk_host_time_domain;

+    struct vkd3d_mutex blocked_queues_mutex;
     struct d3d12_command_queue *blocked_queues[VKD3D_MAX_DEVICE_BLOCKED_QUEUES];
     unsigned int blocked_queue_count;