ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: remove inconvenient pad mutex 

It takes too long to wait for some handlers after all, causing stutter.
This commit is contained in:
Megamouse 2021-08-29 08:40:39 +02:00
parent 2eb0d19a75
commit a33b2afe08
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
rpcs3/Input/pad_thread.cpp
View File

@ -226,59 +226,55 @@ void pad_thread::ThreadFunc()
u32 connected_devices = 0; u32 connected_devices = 0;
for (auto& cur_pad_handler : handlers)
{ {
std::lock_guard lock(pad::g_pad_mutex); cur_pad_handler.second->ThreadProc();
connected_devices += cur_pad_handler.second->connected_devices;
}
for (auto& cur_pad_handler : handlers) m_info.now_connect = connected_devices + num_ldd_pad;
// The input_ignored section is only reached when a dialog was closed and the pads are still intercepted.
// As long as any of the listed buttons is pressed, cellPadGetData will ignore all input (needed for Hotline Miami).
// ignore_input was added because if we keep the pads intercepted, then some games will enter the menu due to unexpected system interception (tested with Ninja Gaiden Sigma).
const bool input_ignored = m_info.ignore_input && !(m_info.system_info & CELL_PAD_INFO_INTERCEPTED);
bool any_button_pressed = false;
for (usz i = 0; i < m_pads.size(); i++)
{
const auto& pad = m_pads[i];
// I guess this is the best place to add pressure sensitivity without too much code duplication.
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
{ {
cur_pad_handler.second->ThreadProc(); const bool adjust_pressure = pad->m_pressure_intensity_button_index >= 0 && pad->m_buttons[pad->m_pressure_intensity_button_index].m_pressed;
connected_devices += cur_pad_handler.second->connected_devices;
}
m_info.now_connect = connected_devices + num_ldd_pad; for (auto& button : pad->m_buttons)
// The input_ignored section is only reached when a dialog was closed and the pads are still intercepted.
// As long as any of the listed buttons is pressed, cellPadGetData will ignore all input (needed for Hotline Miami).
// ignore_input was added because if we keep the pads intercepted, then some games will enter the menu due to unexpected system interception (tested with Ninja Gaiden Sigma).
const bool input_ignored = m_info.ignore_input && !(m_info.system_info & CELL_PAD_INFO_INTERCEPTED);
bool any_button_pressed = false;
for (usz i = 0; i < m_pads.size(); i++)
{
const auto& pad = m_pads[i];
// I guess this is the best place to add pressure sensitivity without too much code duplication.
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
{ {
const bool adjust_pressure = pad->m_pressure_intensity_button_index >= 0 && pad->m_buttons[pad->m_pressure_intensity_button_index].m_pressed; if (button.m_pressed)
for (auto& button : pad->m_buttons)
{ {
if (button.m_pressed) if (button.m_outKeyCode == CELL_PAD_CTRL_CROSS ||
button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE ||
button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
button.m_outKeyCode == CELL_PAD_CTRL_SQUARE ||
button.m_outKeyCode == CELL_PAD_CTRL_START ||
button.m_outKeyCode == CELL_PAD_CTRL_SELECT)
{ {
if (button.m_outKeyCode == CELL_PAD_CTRL_CROSS || any_button_pressed = true;
button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE || }
button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
button.m_outKeyCode == CELL_PAD_CTRL_SQUARE ||
button.m_outKeyCode == CELL_PAD_CTRL_START ||
button.m_outKeyCode == CELL_PAD_CTRL_SELECT)
{
any_button_pressed = true;
}
if (adjust_pressure) if (adjust_pressure)
{ {
button.m_value = pad->m_pressure_intensity; button.m_value = pad->m_pressure_intensity;
}
} }
} }
} }
} }
}
if (input_ignored && !any_button_pressed) if (input_ignored && !any_button_pressed)
{ {
m_info.ignore_input = false; m_info.ignore_input = false;
}
} }
std::this_thread::sleep_for(1ms); std::this_thread::sleep_for(1ms);