Conor McCarthy : vkd3d: Do not flush descriptor heaps stored in the command list when the array size is exceeded.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 5c097521942cb4fa5e076c6a89ef4c197e20c409
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/5c097521942cb4fa5e076c6a89ef4c...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Wed Aug 23 11:07:16 2023 +1000

vkd3d: Do not flush descriptor heaps stored in the command list when the array size is exceeded.

An earlier patch introduced a bug which overflows the descriptor heap
array. The array should not be emptied here in case the list is
resubmitted, so just flush the new heap.

---

 libs/vkd3d/command.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 8b5f7899..42a98763 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3225,7 +3225,10 @@ static void command_list_add_descriptor_heap(struct d3d12_command_list *list, st
         {
             /* 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);
+            vkd3d_mutex_lock(&heap->vk_sets_mutex);
+            d3d12_desc_flush_vk_heap_updates_locked(heap, list->device);
+            vkd3d_mutex_unlock(&heap->vk_sets_mutex);
+            return;
         }
         list->descriptor_heaps[list->descriptor_heap_count++] = heap;
     }