archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: only copy relevant members to external buttons and sticks
Some checks failed
Generate Translation Template / Generate Translation Template (push) Failing after 41s
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Has been skipped
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Has been skipped
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Mac Intel (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Mac Apple Silicon (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Windows (push) Has been cancelled
Details

Browse source 
fixes a crash in std::set, which is not thread safe
This commit is contained in:
Megamouse 2025-06-09 02:36:58 +02:00
parent 823e17288c
commit 5514d7c3d8
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/Io/pad_types.h
View file

@ -379,20 +379,22 @@ enum special_button_value
struct Button struct Button
{ {
u32 m_offset = 0; u32 m_offset = 0;
std::set<u32> m_key_codes{};
u32 m_outKeyCode = 0; u32 m_outKeyCode = 0;
u16 m_value = 0; u16 m_value = 0;
bool m_pressed = false; bool m_pressed = false;
std::set<u32> m_key_codes{};
u16 m_actual_value = 0; // only used in keyboard_pad_handler u16 m_actual_value = 0; // only used in keyboard_pad_handler
bool m_analog = false; // only used in keyboard_pad_handler bool m_analog = false; // only used in keyboard_pad_handler
bool m_trigger = false; // only used in keyboard_pad_handler bool m_trigger = false; // only used in keyboard_pad_handler
std::map<u32, u16> m_pressed_keys{}; // only used in keyboard_pad_handler std::map<u32, u16> m_pressed_keys{}; // only used in keyboard_pad_handler
Button(){}
Button(u32 offset, std::set<u32> key_codes, u32 outKeyCode) Button(u32 offset, std::set<u32> key_codes, u32 outKeyCode)
: m_offset(offset) : m_offset(offset)
, m_key_codes(std::move(key_codes))
, m_outKeyCode(outKeyCode) , m_outKeyCode(outKeyCode)
, m_key_codes(std::move(key_codes))
{ {
if (offset == CELL_PAD_BTN_OFFSET_DIGITAL1) if (offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
{ {
@ -419,9 +421,10 @@ struct Button
struct AnalogStick struct AnalogStick
{ {
u32 m_offset = 0; u32 m_offset = 0;
u16 m_value = 128;
std::set<u32> m_key_codes_min{}; std::set<u32> m_key_codes_min{};
std::set<u32> m_key_codes_max{}; std::set<u32> m_key_codes_max{};
u16 m_value = 128;
std::map<u32, u16> m_pressed_keys_min{}; // only used in keyboard_pad_handler std::map<u32, u16> m_pressed_keys_min{}; // only used in keyboard_pad_handler
std::map<u32, u16> m_pressed_keys_max{}; // only used in keyboard_pad_handler std::map<u32, u16> m_pressed_keys_max{}; // only used in keyboard_pad_handler

23
rpcs3/Input/pad_thread.cpp
View file

@ -305,8 +305,27 @@ void pad_thread::apply_copilots()
continue; continue;
} }
pad->m_buttons_external = pad->m_buttons; pad->m_buttons_external.resize(pad->m_buttons.size());
pad->m_sticks_external = pad->m_sticks;
for (usz i = 0; i < pad->m_buttons.size(); i++)
{
const Button& src = pad->m_buttons[i];
Button& dst = pad->m_buttons_external[i];
dst.m_offset = src.m_offset;
dst.m_outKeyCode = src.m_outKeyCode;
dst.m_value = src.m_value;
dst.m_pressed = src.m_pressed;
}
for (usz i = 0; i < pad->m_sticks.size(); i++)
{
const AnalogStick& src = pad->m_sticks[i];
AnalogStick& dst = pad->m_sticks_external[i];
dst.m_offset = src.m_offset;
dst.m_value = src.m_value;
}
if (pad->copilots.empty() || pad->is_copilot()) if (pad->copilots.empty() || pad->is_copilot())
{ {