Merge pull request #15220 from unknownbrackets/vulkan-exit

Vulkan: Fix use-after-free on shutdown
hrydgard · Dec 10, 2021 · 7b07a13 · 7b07a13
2 parents 97f3b47 + fe7b573
commit 7b07a13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -449,7 +449,7 @@ void VulkanRenderManager::CompileThreadFunc() {
 		if (!run_) {
 			break;
 		}
-		for (auto entry : toCompile) {
+		for (auto &entry : toCompile) {
 			switch (entry.type) {
 			case CompileQueueEntry::Type::GRAPHICS:
 				entry.graphics->Create(vulkan_);

diff --git a/GPU/Vulkan/PipelineManagerVulkan.cpp b/GPU/Vulkan/PipelineManagerVulkan.cpp
@@ -37,7 +37,10 @@ void PipelineManagerVulkan::Clear() {
 		if (value->pipeline) {
 			VkPipeline pipeline = value->pipeline->pipeline;
 			vulkan_->Delete().QueueDeletePipeline(pipeline);
-			delete value->pipeline;
+			vulkan_->Delete().QueueCallback([](void *p) {
+				VKRGraphicsPipeline *pipeline = (VKRGraphicsPipeline *)p;
+				delete pipeline;
+			}, value->pipeline);
 		} else {
 			// Something went wrong.
 			ERROR_LOG(G3D, "Null pipeline found in PipelineManagerVulkan::Clear - didn't wait for asyncs?");