summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-26 17:51:15 -0800
committerGravatar GitHub2017-02-26 17:51:15 -0800
commitb250ce21b9a62cb573540fdb14f30c28fa66e6ad (patch)
treeef55a0cd4a531a097de2152f563d712551972c4b /src/core/core.cpp
parentMerge pull request #2595 from jroweboy/patch (diff)
parentPerfStats: Re-order and document members better (diff)
downloadyuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.tar.gz
yuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.tar.xz
yuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.zip
Merge pull request #2587 from yuriks/status-bar
Replace built-in Profiler with indicators in status bar
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index c9c9b7615..140ff6451 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -109,6 +109,10 @@ void System::PrepareReschedule() {
109 reschedule_pending = true; 109 reschedule_pending = true;
110} 110}
111 111
112PerfStats::Results System::GetAndResetPerfStats() {
113 return perf_stats.GetAndResetStats(CoreTiming::GetGlobalTimeUs());
114}
115
112void System::Reschedule() { 116void System::Reschedule() {
113 if (!reschedule_pending) { 117 if (!reschedule_pending) {
114 return; 118 return;
@@ -140,6 +144,10 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
140 144
141 LOG_DEBUG(Core, "Initialized OK"); 145 LOG_DEBUG(Core, "Initialized OK");
142 146
147 // Reset counters and set time origin to current frame
148 GetAndResetPerfStats();
149 perf_stats.BeginSystemFrame();
150
143 return ResultStatus::Success; 151 return ResultStatus::Success;
144} 152}
145 153