From 982856e70d4f0567be2d682d3d85214efdb05654 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 25 Feb 2020 22:56:50 +0300 Subject: [PATCH] overlays: remove unused threadpool --- rpcs3/Emu/RSX/Overlays/overlays.cpp | 18 ++---------------- rpcs3/Emu/RSX/Overlays/overlays.h | 3 --- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp index eae7cc2f5b..3e05be80cc 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "overlays.h" -#include "../GSRender.h" +#include "../GSRender.h" #include "Input/pad_thread.h" LOG_CHANNEL(overlays); @@ -152,25 +152,11 @@ namespace rsx // Unreachable return 0; } - + void user_interface::close(bool use_callback) { // Force unload exit.release(true); - { - reader_lock lock(m_threadpool_mutex); - for (auto& worker : m_workers) - { - if (std::this_thread::get_id() != worker.get_id() && worker.joinable()) - { - worker.join(); - } - else - { - worker.detach(); - } - } - } pad::SetIntercepted(false); diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index 8c1a2884de..caa319d216 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -79,9 +79,6 @@ namespace rsx std::function on_close; - shared_mutex m_threadpool_mutex; - std::list m_workers; - public: s32 return_code = CELL_OK;