mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-10 01:59:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

try to fix pad interception

Browse source
This commit is contained in:
Megamouse 2021-05-29 06:27:53 +02:00
commit 046d029e89
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,8 @@ namespace rsx
s32 user_interface::run_input_loop() s32 user_interface::run_input_loop()
{ {
m_interactive = true;
const u64 ms_interval = 200; const u64 ms_interval = 200;
std::array<steady_clock::time_point, CELL_PAD_MAX_PORT_NUM> timestamp; std::array<steady_clock::time_point, CELL_PAD_MAX_PORT_NUM> timestamp;
timestamp.fill(steady_clock::now()); timestamp.fill(steady_clock::now());
@ -86,6 +88,9 @@ namespace rsx
int pad_index = -1; int pad_index = -1;
for (const auto &pad : handler->GetPads()) for (const auto &pad : handler->GetPads())
{ {
if (exit)
break;
if (++pad_index >= CELL_PAD_MAX_PORT_NUM) if (++pad_index >= CELL_PAD_MAX_PORT_NUM)
{ {
rsx_log.fatal("The native overlay cannot handle more than 7 pads! Current number of pads: %d", pad_index + 1); rsx_log.fatal("The native overlay cannot handle more than 7 pads! Current number of pads: %d", pad_index + 1);
@ -193,20 +198,29 @@ namespace rsx
} }
if (exit) if (exit)
return 0; break;
} }
} }
refresh(); refresh();
} }
// Unreachable // Disable pad interception since this user interface has to be interactive.
// Non-interactive user intefaces handle this in close in order to prevent a g_pad_mutex deadlock.
if (m_stop_pad_interception)
{
input::SetIntercepted(false);
}
m_interactive = false;
return 0; return 0;
} }
void user_interface::close(bool use_callback, bool stop_pad_interception) void user_interface::close(bool use_callback, bool stop_pad_interception)
{ {
// Force unload // Force unload
m_stop_pad_interception.release(stop_pad_interception);
exit.release(true); exit.release(true);
while (u64 b = thread_bits) while (u64 b = thread_bits)
@ -220,7 +234,9 @@ namespace rsx
thread_bits.wait(b); thread_bits.wait(b);
} }
if (stop_pad_interception) // Only disable pad interception if this user interface is not interactive.
// Interactive user interfaces handle this in run_input_loop in order to prevent a g_pad_mutex deadlock.
if (!m_interactive && m_stop_pad_interception)
{ {
input::SetIntercepted(false); input::SetIntercepted(false);
} }

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

@ -72,6 +72,8 @@ namespace rsx
Timer input_timer; Timer input_timer;
std::set<u8> auto_repeat_buttons = { pad_button::dpad_up, pad_button::dpad_down, pad_button::dpad_left, pad_button::dpad_right }; std::set<u8> auto_repeat_buttons = { pad_button::dpad_up, pad_button::dpad_down, pad_button::dpad_left, pad_button::dpad_right };
atomic_t<bool> exit = false; atomic_t<bool> exit = false;
atomic_t<bool> m_interactive = false;
atomic_t<bool> m_stop_pad_interception = false;
atomic_t<u64> thread_bits = 0; atomic_t<u64> thread_bits = 0;
static thread_local u64 g_thread_bit; static thread_local u64 g_thread_bit;