Merge pull request #2037 from billhollings/fix-debug-msg-deadlock

Fix deadlock when reporting debug message on MVKInstance destruction.
KhronosGroup · Oct 10, 2023 · ee271b3 · ee271b3
2 parents 568cc3a + 0584aa0
commit ee271b3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKInstance.mm b/MoltenVK/MoltenVK/GPUObjects/MVKInstance.mm
@@ -723,11 +723,12 @@
 	_useCreationCallbacks = true;
 	mvkDestroyContainerContents(_physicalDevices);
 
-	lock_guard<mutex> lock(_dcbLock);
-	mvkDestroyContainerContents(_debugReportCallbacks);
-
-	MVKLogInfo("Destroyed VkInstance for Vulkan version %s with %d Vulkan extensions enabled.",
+	// Since this message may invoke debug callbacks, do it before locking callbacks.
+	MVKLogInfo("Destroying VkInstance for Vulkan version %s with %d Vulkan extensions enabled.",
 			   mvkGetVulkanVersionString(_appInfo.apiVersion).c_str(),
 			   _enabledExtensions.getEnabledCount());
+
+	lock_guard<mutex> lock(_dcbLock);
+	mvkDestroyContainerContents(_debugReportCallbacks);
 }