diff options
| author |  Fernando S | 2023-09-29 13:36:57 +0200 |
|---|---|---|
| committer |  GitHub | 2023-09-29 13:36:57 +0200 |
| commit | d6b3e7f195dcf9a154f4e1ff84c6a1b46ad5bdfc (patch) | |
| tree | 936eb95eb694f525ba7daaabc89404fc4a5ea557 /src/core/hid/emulated_controller.h | |
| parent | Merge pull request #11622 from liamwhite/qcr-reg1 (diff) | |
| parent | Reduce core timing mutex contention (diff) | |
| download | yuzu-d6b3e7f195dcf9a154f4e1ff84c6a1b46ad5bdfc.tar.gz yuzu-d6b3e7f195dcf9a154f4e1ff84c6a1b46ad5bdfc.tar.xz yuzu-d6b3e7f195dcf9a154f4e1ff84c6a1b46ad5bdfc.zip | |
Merge pull request #11546 from Kelebek1/core_timing_mutex
Reduce core timing mutex contention
Diffstat (limited to 'src/core/hid/emulated_controller.h')
| -rw-r--r-- | src/core/hid/emulated_controller.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 88d77db8d..d4500583e 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h | |||
| @@ -603,6 +603,8 @@ private: | |||
| 603 | 603 | ||
| 604 | mutable std::mutex mutex; | 604 | mutable std::mutex mutex; |
| 605 | mutable std::mutex callback_mutex; | 605 | mutable std::mutex callback_mutex; |
| 606 | mutable std::mutex npad_mutex; | ||
| 607 | mutable std::mutex connect_mutex; | ||
| 606 | std::unordered_map<int, ControllerUpdateCallback> callback_list; | 608 | std::unordered_map<int, ControllerUpdateCallback> callback_list; |
| 607 | int last_callback_key = 0; | 609 | int last_callback_key = 0; |
| 608 | 610 | ||