piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10540 from nyanpasu64/fix-gcadapter-atomics

Browse Source 
Remove atomic usage and fix mutex locking in GCAdapter code
This commit is contained in:
JosJuice
2022-04-23 22:04:10 +02:00
committed by GitHub
parent cb5e967fd4 b5a7ae52b5
commit e0afcb3b94
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -60,7 +60,8 @@ static std::mutex s_mutex;
static u8 s_controller_payload[37];
static u8 s_controller_payload_swap[37];
static std::atomic<int> s_controller_payload_size = {0};
// Only access with s_mutex held!
static int s_controller_payload_size = {0};
static std::thread s_adapter_input_thread;
static std::thread s_adapter_output_thread;
@ -112,7 +113,7 @@ static void Read()
{
std::lock_guard<std::mutex> lk(s_mutex);
std::swap(s_controller_payload_swap, s_controller_payload);
s_controller_payload_size.store(payload_size);
s_controller_payload_size = payload_size;
}
Common::YieldCPU();
@ -478,7 +479,7 @@ GCPadStatus Input(int chan)
std::lock_guard<std::mutex> lk(s_mutex);
std::copy(std::begin(s_controller_payload), std::end(s_controller_payload),
std::begin(controller_payload_copy));
payload_size = s_controller_payload_size.load();
payload_size = s_controller_payload_size;
}
GCPadStatus pad = {};