diff options
| author | 2017-02-26 17:51:15 -0800 | |
|---|---|---|
| committer | 2017-02-26 17:51:15 -0800 | |
| commit | b250ce21b9a62cb573540fdb14f30c28fa66e6ad (patch) | |
| tree | ef55a0cd4a531a097de2152f563d712551972c4b /src/core/core.h | |
| parent | Merge pull request #2595 from jroweboy/patch (diff) | |
| parent | PerfStats: Re-order and document members better (diff) | |
| download | yuzu-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.h')
| -rw-r--r-- | src/core/core.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/core.h b/src/core/core.h index 17572a74f..6c9c936b5 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <string> | 8 | #include <string> |
| 9 | |||
| 10 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 11 | #include "core/memory.h" | 10 | #include "core/memory.h" |
| 11 | #include "core/perf_stats.h" | ||
| 12 | 12 | ||
| 13 | class EmuWindow; | 13 | class EmuWindow; |
| 14 | class ARM_Interface; | 14 | class ARM_Interface; |
| @@ -83,6 +83,8 @@ public: | |||
| 83 | /// Prepare the core emulation for a reschedule | 83 | /// Prepare the core emulation for a reschedule |
| 84 | void PrepareReschedule(); | 84 | void PrepareReschedule(); |
| 85 | 85 | ||
| 86 | PerfStats::Results GetAndResetPerfStats(); | ||
| 87 | |||
| 86 | /** | 88 | /** |
| 87 | * Gets a reference to the emulated CPU. | 89 | * Gets a reference to the emulated CPU. |
| 88 | * @returns A reference to the emulated CPU. | 90 | * @returns A reference to the emulated CPU. |
| @@ -91,6 +93,9 @@ public: | |||
| 91 | return *cpu_core; | 93 | return *cpu_core; |
| 92 | } | 94 | } |
| 93 | 95 | ||
| 96 | PerfStats perf_stats; | ||
| 97 | FrameLimiter frame_limiter; | ||
| 98 | |||
| 94 | private: | 99 | private: |
| 95 | /** | 100 | /** |
| 96 | * Initialize the emulated system. | 101 | * Initialize the emulated system. |