diff options
| author | 2020-02-14 14:40:20 -0500 | |
|---|---|---|
| committer | 2020-02-14 14:40:20 -0500 | |
| commit | f552d553bac1374c583d748dad27f8c86e86c4a0 (patch) | |
| tree | 1da4aa037ff417fa4fd43bffac267dcb2b55a72d /src/core/core_timing.cpp | |
| parent | Merge pull request #3379 from ReinUsesLisp/cbuf-offset (diff) | |
| parent | Core: Correct compilition in GCC (diff) | |
| download | yuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.tar.gz yuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.tar.xz yuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.zip | |
Merge pull request #3401 from FernandoS27/synchronization
Set of refactors for Kernel Synchronization and Hardware Constants
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index aa09fa453..46d4178c4 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "common/assert.h" | 12 | #include "common/assert.h" |
| 13 | #include "common/thread.h" | 13 | #include "common/thread.h" |
| 14 | #include "core/core_timing_util.h" | 14 | #include "core/core_timing_util.h" |
| 15 | #include "core/hardware_properties.h" | ||
| 15 | 16 | ||
| 16 | namespace Core::Timing { | 17 | namespace Core::Timing { |
| 17 | 18 | ||
| @@ -215,7 +216,7 @@ void CoreTiming::Idle() { | |||
| 215 | } | 216 | } |
| 216 | 217 | ||
| 217 | std::chrono::microseconds CoreTiming::GetGlobalTimeUs() const { | 218 | std::chrono::microseconds CoreTiming::GetGlobalTimeUs() const { |
| 218 | return std::chrono::microseconds{GetTicks() * 1000000 / BASE_CLOCK_RATE}; | 219 | return std::chrono::microseconds{GetTicks() * 1000000 / Hardware::BASE_CLOCK_RATE}; |
| 219 | } | 220 | } |
| 220 | 221 | ||
| 221 | s64 CoreTiming::GetDowncount() const { | 222 | s64 CoreTiming::GetDowncount() const { |