diff options
| author | 2022-07-10 00:47:05 -0400 | |
|---|---|---|
| committer | 2022-07-10 00:47:05 -0400 | |
| commit | c765d5be0bf77af65b254db09997d47a9bddd46e (patch) | |
| tree | b5b0df7ce3ece41a4f1e661a725074ab3100f6ab /src/core/core_timing.h | |
| parent | Merge pull request #8501 from liamwhite/backtrace-again (diff) | |
| parent | Core timing: use only one thread. (diff) | |
| download | yuzu-c765d5be0bf77af65b254db09997d47a9bddd46e.tar.gz yuzu-c765d5be0bf77af65b254db09997d47a9bddd46e.tar.xz yuzu-c765d5be0bf77af65b254db09997d47a9bddd46e.zip | |
Merge pull request #8531 from FernandoS27/core-timing-fix-reg
Core timing: use only one thread.
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index a86553e08..c52bffb3b 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -32,7 +32,6 @@ struct EventType { | |||
| 32 | TimedCallback callback; | 32 | TimedCallback callback; |
| 33 | /// A pointer to the name of the event. | 33 | /// A pointer to the name of the event. |
| 34 | const std::string name; | 34 | const std::string name; |
| 35 | mutable std::mutex guard; | ||
| 36 | }; | 35 | }; |
| 37 | 36 | ||
| 38 | /** | 37 | /** |
| @@ -157,7 +156,6 @@ private: | |||
| 157 | std::condition_variable wait_pause_cv; | 156 | std::condition_variable wait_pause_cv; |
| 158 | std::condition_variable wait_signal_cv; | 157 | std::condition_variable wait_signal_cv; |
| 159 | mutable std::mutex event_mutex; | 158 | mutable std::mutex event_mutex; |
| 160 | mutable std::mutex sequence_mutex; | ||
| 161 | 159 | ||
| 162 | std::atomic<bool> paused_state{}; | 160 | std::atomic<bool> paused_state{}; |
| 163 | bool is_paused{}; | 161 | bool is_paused{}; |