From 69b34693f0d8d4f9603c503865585bccde2a0b82 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Wed, 4 Aug 2021 03:05:23 +0300
Subject: [PATCH] vk: Simplify compute job cleanup on exit

- Just call destroy automatically on object destruct
---
 rpcs3/Emu/RSX/VK/VKCompute.h   | 3 +++
 rpcs3/Emu/RSX/VK/VKHelpers.cpp | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h
index 8f35f3e2f2..ed58c5eef5 100644
--- a/rpcs3/Emu/RSX/VK/VKCompute.h
+++ b/rpcs3/Emu/RSX/VK/VKCompute.h
@@ -34,6 +34,9 @@ namespace vk
 		u32 optimal_kernel_size = 1;
 		u32 max_invocations_x = 65535;
 
+		compute_task() = default;
+		virtual ~compute_task() { destroy(); }
+
 		virtual std::vector<std::pair<VkDescriptorType, u8>> get_descriptor_layout();
 
 		void init_descriptors();
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
index 78c2b71021..5c87d420e3 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
@@ -72,10 +72,6 @@ namespace vk
 
 		vk::get_upload_heap()->destroy();
 
-		for (const auto& p : g_compute_tasks)
-		{
-			p.second->destroy();
-		}
 		g_compute_tasks.clear();
 
 		for (const auto& p : g_overlay_passes)