archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

overlays: remove unused threadpool

Browse source
This commit is contained in:
Nekotekina 2020-02-25 22:56:50 +03:00
parent 144c20649f
commit 982856e70d
2 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/RSX/Overlays/overlays.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "overlays.h" #include "overlays.h"
#include "../GSRender.h" #include "../GSRender.h"
#include "Input/pad_thread.h" #include "Input/pad_thread.h"
LOG_CHANNEL(overlays); LOG_CHANNEL(overlays);
@ -152,25 +152,11 @@ namespace rsx
// Unreachable // Unreachable
return 0; return 0;
} }
void user_interface::close(bool use_callback) void user_interface::close(bool use_callback)
{ {
// Force unload // Force unload
exit.release(true); 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); pad::SetIntercepted(false);

3
rpcs3/Emu/RSX/Overlays/overlays.h
View file

@ -79,9 +79,6 @@ namespace rsx
std::function<void(s32 status)> on_close; std::function<void(s32 status)> on_close;
shared_mutex m_threadpool_mutex;
std::list<std::thread> m_workers;
public: public:
s32 return_code = CELL_OK; s32 return_code = CELL_OK;