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

Merge pull request #76 from beeanyew/input-system-mutex-revert 

[Input System] xe_mutex revert
This commit is contained in:
chrisps 2022-09-18 07:46:02 -07:00 committed by GitHub
parent a29a7436e0 cd17f1846f
commit def00e6ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/hid/input_system.cc
View File

@ -137,8 +137,8 @@ X_INPUT_VIBRATION InputSystem::ModifyVibrationLevel(
modified_vibration.right_motor_speed = 0;
return modified_vibration;
}
std::unique_lock<xe_mutex> InputSystem::lock() {
return std::unique_lock<xe_mutex>{lock_};
std::unique_lock<xe_unlikely_mutex> InputSystem::lock() {
return std::unique_lock<xe_unlikely_mutex>{lock_};
}
} // namespace hid
} // namespace xe

4
src/xenia/hid/input_system.h
View File

@ -48,7 +48,7 @@ class InputSystem {
void UpdateUsedSlot(uint8_t slot, bool connected);
uint8_t GetConnectedSlots() const { return connected_slot; }
std::unique_lock<xe_mutex> lock();
std::unique_lock<xe_unlikely_mutex> lock();
private:
xe::ui::Window* window_ = nullptr;
@ -57,7 +57,7 @@ class InputSystem {
X_INPUT_VIBRATION ModifyVibrationLevel(X_INPUT_VIBRATION* vibration);
uint8_t connected_slot = 0b0001;
xe_mutex lock_;
xe_unlikely_mutex lock_;
};
} // namespace hid