Metal: unbind descriptor sets upon destruction

google · Nov 12, 2024 · d929cbe · d929cbe
1 parent 61c4df9
commit d929cbe
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/filament/backend/src/metal/MetalDriver.mm b/filament/backend/src/metal/MetalDriver.mm
@@ -872,6 +872,15 @@
 
 void MetalDriver::destroyDescriptorSet(Handle<HwDescriptorSet> dsh) {
     DEBUG_LOG("destroyDescriptorSet(dsh = %d)\n", dsh.getId());
+
+    // Unbind this descriptor set.
+    auto* descriptorSet = handle_cast<MetalDescriptorSet>(dsh);
+    for (size_t i = 0; i < MAX_DESCRIPTOR_SET_COUNT; i++) {
+        if (UTILS_UNLIKELY(mContext->currentDescriptorSets[i] == descriptorSet)) {
+            mContext->currentDescriptorSets[i] = nullptr;
+        }
+    }
+
     if (dsh) {
         executeAfterCurrentCommandBufferCompletes(
                 [this, dsh]() mutable { destruct_handle<MetalDescriptorSet>(dsh); });