dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 05:45:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

input: only copy back necessary values in keyboard_pad_handler::process

Browse Source 
Profiling has shown that copying both containers took longest.
This commit is contained in:
Megamouse 2026-05-15 00:10:35 +02:00
parent fdce82fc24
commit e4a49cd425
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -1346,26 +1346,43 @@ void keyboard_pad_handler::process()
// Normalize and apply pad squircling // Normalize and apply pad squircling
// Copy sticks first. We don't want to modify the raw internal values // Copy sticks first. We don't want to modify the raw internal values
std::array<AnalogStick, 4> squircled_sticks = pad_internal.m_sticks; std::array<u16, 4> squircled_sticks =
{
pad_internal.m_sticks[0].m_value,
pad_internal.m_sticks[1].m_value,
pad_internal.m_sticks[2].m_value,
pad_internal.m_sticks[3].m_value
};
// Apply squircling // Apply squircling
if (cfg->lpadsquircling != 0) if (cfg->lpadsquircling != 0)
{ {
u16& lx = squircled_sticks[0].m_value; u16& lx = squircled_sticks[0];
u16& ly = squircled_sticks[1].m_value; u16& ly = squircled_sticks[1];
ConvertToSquirclePoint(lx, ly, cfg->lpadsquircling); ConvertToSquirclePoint(lx, ly, cfg->lpadsquircling);
} }
if (cfg->rpadsquircling != 0) if (cfg->rpadsquircling != 0)
{ {
u16& rx = squircled_sticks[2].m_value; u16& rx = squircled_sticks[2];
u16& ry = squircled_sticks[3].m_value; u16& ry = squircled_sticks[3];
ConvertToSquirclePoint(rx, ry, cfg->rpadsquircling); ConvertToSquirclePoint(rx, ry, cfg->rpadsquircling);
} }
pad->m_buttons = pad_internal.m_buttons; for (usz j = 0; j < pad->m_buttons.size(); j++)
pad->m_sticks = squircled_sticks; // Don't use std::move here. We assign values lockless, so std::move can lead to segfaults. {
const Button& btn_internal = pad_internal.m_buttons[j];
Button& btn = pad->m_buttons[j];
btn.m_value = btn_internal.m_value;
btn.m_pressed = btn_internal.m_pressed;
}
for (usz j = 0; j < pad->m_sticks.size(); j++)
{
pad->m_sticks[j].m_value = squircled_sticks[j];
}
} }
} }