diff options
| author | 2020-02-10 15:02:04 -0400 | |
|---|---|---|
| committer | 2020-06-18 16:29:22 -0400 | |
| commit | 49a7e0984a1210832b8be24433a95711c7ce029b (patch) | |
| tree | 73cfc4456382895f75b6f56f5f1bb96501929de9 /src/common/wall_clock.cpp | |
| parent | Common/Tests: Address Feedback (diff) | |
| download | yuzu-49a7e0984a1210832b8be24433a95711c7ce029b.tar.gz yuzu-49a7e0984a1210832b8be24433a95711c7ce029b.tar.xz yuzu-49a7e0984a1210832b8be24433a95711c7ce029b.zip | |
Core/HostTiming: Allow events to be advanced manually.
Diffstat (limited to 'src/common/wall_clock.cpp')
| -rw-r--r-- | src/common/wall_clock.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index e6161c72c..d4d35f4e7 100644 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp | |||
| @@ -42,14 +42,15 @@ public: | |||
| 42 | 42 | ||
| 43 | u64 GetClockCycles() override { | 43 | u64 GetClockCycles() override { |
| 44 | std::chrono::nanoseconds time_now = GetTimeNS(); | 44 | std::chrono::nanoseconds time_now = GetTimeNS(); |
| 45 | const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_clock_frequency); | 45 | const u128 temporary = |
| 46 | return Common::Divide128On32(temporal, 1000000000).first; | 46 | Common::Multiply64Into128(time_now.count(), emulated_clock_frequency); |
| 47 | return Common::Divide128On32(temporary, 1000000000).first; | ||
| 47 | } | 48 | } |
| 48 | 49 | ||
| 49 | u64 GetCPUCycles() override { | 50 | u64 GetCPUCycles() override { |
| 50 | std::chrono::nanoseconds time_now = GetTimeNS(); | 51 | std::chrono::nanoseconds time_now = GetTimeNS(); |
| 51 | const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency); | 52 | const u128 temporary = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency); |
| 52 | return Common::Divide128On32(temporal, 1000000000).first; | 53 | return Common::Divide128On32(temporary, 1000000000).first; |
| 53 | } | 54 | } |
| 54 | 55 | ||
| 55 | private: | 56 | private: |