[PATCH 0/2] MR185: vkd3d: Fix descriptor write issues.

[PATCH 1/2] vkd3d: Track all descriptor heaps bound during command list recording and flush their writes.

[Conor McCarthy]

From: Conor McCarthy

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54895
---
 libs/vkd3d/command.c       | 75 +++++++++++++++++---------------------
 libs/vkd3d/vkd3d_private.h |  2 +
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index fb6b40b2..094466d2 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3159,6 +3159,27 @@ static void d3d12_command_list_update_descriptor_tables(struct d3d12_command_lis
     }
 }

+static bool contains_heap(struct d3d12_descriptor_heap **heap_array, unsigned int count,
+        const struct d3d12_descriptor_heap *query)
+{
+    unsigned int i;
+
+    for (i = 0; i < count; ++i)
+        if (heap_array[i] == query)
+            return true;
+    return false;
+}
+
+static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list)
+{
+    struct d3d12_device *device = list->device;
+    unsigned int i;
+
+    for (i = 0; i < list->descriptor_heap_count; ++i)
+        d3d12_desc_flush_vk_heap_updates(list->descriptor_heaps[i], device);
+    list->descriptor_heap_count = 0;
+}
+
 static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *list,
         enum vkd3d_pipeline_bind_point bind_point, struct d3d12_descriptor_heap *heap)
 {
@@ -3183,6 +3204,17 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l
         bindings->sampler_heap_id = heap->serial_id;
     }

+    if (!contains_heap(list->descriptor_heaps, list->descriptor_heap_count, heap))
+    {
+        if (list->descriptor_heap_count == ARRAY_SIZE(list->descriptor_heaps))
+        {
+            /* Descriptors can be written after binding. */
+            FIXME("Flushing descriptor updates while list %p is not closed.\n", list);
+            command_list_flush_vk_heap_updates(list);
+        }
+        list->descriptor_heaps[list->descriptor_heap_count++] = heap;
+    }
+
     for (set = 0; set < ARRAY_SIZE(heap->vk_descriptor_sets); ++set)
     {
         VkDescriptorSet vk_descriptor_set = heap->vk_descriptor_sets[set].vk_set;
@@ -5927,6 +5959,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d

list->update_descriptors = device->use_vk_heaps ? d3d12_command_list_update_heap_descriptors
             : d3d12_command_list_update_descriptors;
+    list->descriptor_heap_count = 0;

if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list)))
     {
@@ -6187,44 +6220,6 @@ static void d3d12_command_queue_submit_locked(struct d3d12_command_queue *queue)
     }
 }

-static bool contains_heap(const struct d3d12_descriptor_heap **heap_array, unsigned int count,
-        const struct d3d12_descriptor_heap *query)
-{
-    unsigned int i;
-
-    for (i = 0; i < count; ++i)
-        if (heap_array[i] == query)
-            return true;
-    return false;
-}
-
-static void pipeline_bindings_flush_vk_heap_updates(struct vkd3d_pipeline_bindings *bindings,
-        struct d3d12_device *device)
-{
-    /* Only two heaps are strictly allowed, but more could be supported with a hack. */
-    const struct d3d12_descriptor_heap *heap_array[3];
-    struct d3d12_descriptor_heap *descriptor_heap;
-    unsigned int i, count;
-    uint64_t mask;
-
-    mask = bindings->descriptor_table_active_mask & bindings->root_signature->descriptor_table_mask;
-
-    for (i = 0, count = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
-    {
-        if (!(mask & (1ull << i)) || !bindings->descriptor_tables[i])
-            continue;
-
-        descriptor_heap = d3d12_desc_get_descriptor_heap(bindings->descriptor_tables[i]);
-        /* Another thread could be writing unused descriptors, so try to check each heap only once. Flushing
-         * any updates added after the first flush will only delay execution of the command list. */
-        if (contains_heap(heap_array, count, descriptor_heap))
-            continue;
-        if (count < ARRAY_SIZE(heap_array))
-            heap_array[count++] = descriptor_heap;
-        d3d12_desc_flush_vk_heap_updates(descriptor_heap, device);
-    }
-}
-
 static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12CommandQueue *iface,
         UINT command_list_count, ID3D12CommandList * const *command_lists)
 {
@@ -6258,9 +6253,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm
             return;
         }

-        if (cmd_list->state)
-            pipeline_bindings_flush_vk_heap_updates(&cmd_list->pipeline_bindings[cmd_list->state->vk_bind_point],
-                    cmd_list->device);
+        command_list_flush_vk_heap_updates(cmd_list);

buffers[i] = cmd_list->vk_command_buffer;
     }
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 88dc5772..0af643b0 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1407,6 +1407,8 @@ struct d3d12_command_list
     VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT];

void (*update_descriptors)(struct d3d12_command_list *list, enum vkd3d_pipeline_bind_point bind_point);
+    struct d3d12_descriptor_heap *descriptor_heaps[64];
+    unsigned int descriptor_heap_count;

struct vkd3d_private_store private_store;
 };

[PATCH 2/2] vkd3d: Synchronise concurrent descriptor heap binding by multiple command lists.

[Conor McCarthy]

From: Conor McCarthy

It is possible for multiple command lists to use the same heap, and
submit it simultaneously to multiple d3d12 queues.
---
 libs/vkd3d/command.c       | 10 +++++++++-
 libs/vkd3d/resource.c      |  4 +++-
 libs/vkd3d/vkd3d_private.h |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 094466d2..81ddccb4 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3176,7 +3176,11 @@ static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list)
     unsigned int i;

for (i = 0; i < list->descriptor_heap_count; ++i)
-        d3d12_desc_flush_vk_heap_updates(list->descriptor_heaps[i], device);
+    {
+        vkd3d_mutex_lock(&list->descriptor_heaps[i]->vk_sets_mutex);
+        d3d12_desc_flush_vk_heap_updates_locked(list->descriptor_heaps[i], device);
+        vkd3d_mutex_unlock(&list->descriptor_heaps[i]->vk_sets_mutex);
+    }
     list->descriptor_heap_count = 0;
 }

@@ -3215,6 +3219,8 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l
         list->descriptor_heaps[list->descriptor_heap_count++] = heap;
     }

+    vkd3d_mutex_lock(&heap->vk_sets_mutex);
+
     for (set = 0; set < ARRAY_SIZE(heap->vk_descriptor_sets); ++set)
     {
         VkDescriptorSet vk_descriptor_set = heap->vk_descriptor_sets[set].vk_set;
@@ -3225,6 +3231,8 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l
         VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bindings->vk_bind_point, rs->vk_pipeline_layout,
                 rs->vk_set_count + set, 1, &vk_descriptor_set, 0, NULL));
     }
+
+    vkd3d_mutex_unlock(&heap->vk_sets_mutex);
 }

static void d3d12_command_list_update_heap_descriptors(struct d3d12_command_list *list,
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index d12191a9..213b2dbb 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -2323,7 +2323,7 @@ static void d3d12_desc_write_vk_heap(struct d3d12_descriptor_heap *descriptor_he
     writes->count = i;
 }

-void d3d12_desc_flush_vk_heap_updates(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device)
+void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device)
 {
     const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
     struct d3d12_desc *descriptors, *src;
@@ -3724,6 +3724,7 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea
         }

VK_CALL(vkDestroyDescriptorPool(device->vk_device, heap->vk_descriptor_pool, NULL));
+        vkd3d_mutex_destroy(&heap->vk_sets_mutex);

vkd3d_free(heap);

@@ -3946,6 +3947,7 @@ static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descript
         return hr;

d3d12_descriptor_heap_vk_descriptor_sets_init(descriptor_heap, device, desc);
+    vkd3d_mutex_init(&descriptor_heap->vk_sets_mutex);

d3d12_device_add_ref(descriptor_heap->device = device);

diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 0af643b0..79474414 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -988,13 +988,14 @@ struct d3d12_descriptor_heap

VkDescriptorPool vk_descriptor_pool;
     struct d3d12_descriptor_heap_vk_set vk_descriptor_sets[VKD3D_SET_INDEX_COUNT];
+    struct vkd3d_mutex vk_sets_mutex;

unsigned int volatile dirty_list_head;

uint8_t DECLSPEC_ALIGN(sizeof(void *)) descriptors[];
 };

-void d3d12_desc_flush_vk_heap_updates(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device);
+void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device);

static inline struct d3d12_descriptor_heap *d3d12_desc_get_descriptor_heap(const struct d3d12_desc *descriptor)
 {

[PATCH 0/2] MR185: vkd3d: Fix descriptor write issues. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.