yuzu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-26 03:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

controllers/npad: Make press_state atomic

Browse source
This commit is contained in:
Morph 2020-11-25 07:48:00 -05:00
parent 5836786246
commit 54ea3c47c8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/service/hid/controllers/npad.cpp
View file

@ -1058,7 +1058,7 @@ void Controller_NPad::ClearAllControllers() {
} }
u32 Controller_NPad::GetAndResetPressState() { u32 Controller_NPad::GetAndResetPressState() {
return std::exchange(press_state, 0); return press_state.exchange(0);
} }
bool Controller_NPad::IsControllerSupported(NPadControllerType controller) const { bool Controller_NPad::IsControllerSupported(NPadControllerType controller) const {

3
src/core/hle/service/hid/controllers/npad.h
View file

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <atomic>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/frontend/input.h" #include "core/frontend/input.h"
@ -415,7 +416,7 @@ private:
bool IsControllerSupported(NPadControllerType controller) const; bool IsControllerSupported(NPadControllerType controller) const;
void RequestPadStateUpdate(u32 npad_id); void RequestPadStateUpdate(u32 npad_id);
u32 press_state{}; std::atomic<u32> press_state{};
NpadStyleSet style{}; NpadStyleSet style{};
std::array<NPadEntry, 10> shared_memory_entries{}; std::array<NPadEntry, 10> shared_memory_entries{};