diff options
| author |  bunnei | 2018-08-06 18:03:05 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-06 18:03:05 -0400 |
| commit | 83ef37ca37e052f4293c7693766f36f24754388e (patch) | |
| tree | c113fb5c96276e1def8d2f4258b66167b0dd0c2b /src/core/core_timing.cpp | |
| parent | Merge pull request #945 from lioncash/exist (diff) | |
| parent | perf_stats: Correct literal used for MAX_LAG_TIME_US (diff) | |
| download | yuzu-83ef37ca37e052f4293c7693766f36f24754388e.tar.gz yuzu-83ef37ca37e052f4293c7693766f36f24754388e.tar.xz yuzu-83ef37ca37e052f4293c7693766f36f24754388e.zip | |
Merge pull request #934 from lioncash/chrono
core_timing: Make GetGlobalTimeUs() return std::chrono::microseconds
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index b2e3a495a..d3bb6f818 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -226,8 +226,8 @@ void Idle() { | |||
| 226 | downcount = 0; | 226 | downcount = 0; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | u64 GetGlobalTimeUs() { | 229 | std::chrono::microseconds GetGlobalTimeUs() { |
| 230 | return GetTicks() * 1000000 / BASE_CLOCK_RATE; | 230 | return std::chrono::microseconds{GetTicks() * 1000000 / BASE_CLOCK_RATE}; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | int GetDowncount() { | 233 | int GetDowncount() { |