commit 6b269dd52a32d404786b0f46954e9a8bff9d923f
author Kyle Charbonneau <kylechar@google.com> Wed Nov 20 14:22:11 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 20 14:22:11 2024 +0000
tree 133a82d413eb31720b6e3c95906ef5bebe72ff18
parent 3b0e2bdb8fd3e52f8b3bf46f7c39203215ad83ff

Change DescriptorSetAllocator destruction order

During TickImpl() DescriptorSetAllocators were destroyed by calling
mDescriptorAllocatorsPendingDeallocation->ClearUpTo() after
GetFencedDeleter()->Tick(). Change the order so
mDescriptorAllocatorsPendingDeallocation operations happen at the same
time.

Change-Id: I41af35f50b87c1a1defda5fb334b0c497c670d05
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/215054
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Kyle Charbonneau <kylechar@google.com>

src/dawn/native/vulkan/DeviceVk.cpp

diff --git a/src/dawn/native/vulkan/DeviceVk.cpp b/src/dawn/native/vulkan/DeviceVk.cpp
index 2e6d2dc..5c3df42 100644
--- a/src/dawn/native/vulkan/DeviceVk.cpp
+++ b/src/dawn/native/vulkan/DeviceVk.cpp
@@ -336,10 +336,10 @@
          mDescriptorAllocatorsPendingDeallocation.IterateUpTo(completedSerial)) {
         allocator->FinishDeallocation(completedSerial);
     }
+    mDescriptorAllocatorsPendingDeallocation.ClearUpTo(completedSerial);
 
     GetResourceMemoryAllocator()->Tick(completedSerial);
     GetFencedDeleter()->Tick(completedSerial);
-    mDescriptorAllocatorsPendingDeallocation.ClearUpTo(completedSerial);
 
     DAWN_TRY(queue->SubmitPendingCommands());
     DAWN_TRY(CheckDebugLayerAndGenerateErrors());
@@ -912,11 +912,11 @@
          mDescriptorAllocatorsPendingDeallocation.IterateUpTo(kMaxExecutionSerial)) {
         allocator->FinishDeallocation(kMaxExecutionSerial);
     }
+    mDescriptorAllocatorsPendingDeallocation.ClearUpTo(kMaxExecutionSerial);
 
     // Releasing the uploader enqueues buffers to be released.
     // Call Tick() again to clear them before releasing the deleter.
     GetResourceMemoryAllocator()->Tick(kMaxExecutionSerial);
-    mDescriptorAllocatorsPendingDeallocation.ClearUpTo(kMaxExecutionSerial);
 
     // Allow recycled memory to be deleted.
     GetResourceMemoryAllocator()->DestroyPool();