summaryrefslogtreecommitdiff
path: root/src/core/core_timing.h
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-06 18:03:05 -0400
committerGravatar GitHub2018-08-06 18:03:05 -0400
commit83ef37ca37e052f4293c7693766f36f24754388e (patch)
treec113fb5c96276e1def8d2f4258b66167b0dd0c2b /src/core/core_timing.h
parentMerge pull request #945 from lioncash/exist (diff)
parentperf_stats: Correct literal used for MAX_LAG_TIME_US (diff)
downloadyuzu-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.h')
-rw-r--r--src/core/core_timing.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 5bbde47f4..dfa161c0d 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -17,6 +17,7 @@
17 * ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") 17 * ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
18 */ 18 */
19 19
20#include <chrono>
20#include <functional> 21#include <functional>
21#include <string> 22#include <string>
22#include "common/common_types.h" 23#include "common/common_types.h"
@@ -86,7 +87,7 @@ void ClearPendingEvents();
86 87
87void ForceExceptionCheck(s64 cycles); 88void ForceExceptionCheck(s64 cycles);
88 89
89u64 GetGlobalTimeUs(); 90std::chrono::microseconds GetGlobalTimeUs();
90 91
91int GetDowncount(); 92int GetDowncount();
92 93