Conor McCarthy : vkd3d: Move descriptor heap tracking to d3d12_command_list_set_descriptor_table().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 9187a417336386e364ad502a705ee805dbd41928
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/9187a417336386e364ad502a705ee8...

Author: Conor McCarthy 
Date:   Tue May  2 15:59:02 2023 +1000

vkd3d: Move descriptor heap tracking to d3d12_command_list_set_descriptor_table().

This is the simplest way to gather this information when command lists
are executed later.

---

libs/vkd3d/command.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 1aeae451..058e292c 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3186,6 +3186,20 @@ static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list)
     }
 }

+static void command_list_add_descriptor_heap(struct d3d12_command_list *list, struct d3d12_descriptor_heap *heap)
+{
+    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;
+    }
+}
+
 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)
 {
@@ -3210,18 +3224,6 @@ 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_heap_count = 0;
-        }
-        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)
@@ -4444,6 +4446,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l
         WARN("Descriptor heap %p is not shader visible.\n", descriptor_heap);
         return;
     }
+    command_list_add_descriptor_heap(list, descriptor_heap);

bindings->descriptor_tables[index] = desc;
     bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index;