diff options
| author |  bunnei | 2019-02-12 19:26:37 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-12 19:26:37 -0500 |
| commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
| tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/core_cpu.cpp | |
| parent | Merge pull request #2104 from ReinUsesLisp/compute-assert (diff) | |
| parent | core_timing: Rename CoreTiming namespace to Core::Timing (diff) | |
| download | yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip | |
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/core/core_cpu.cpp')
| -rw-r--r-- | src/core/core_cpu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index fffda8a99..452366250 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp | |||
| @@ -93,14 +93,14 @@ void Cpu::RunLoop(bool tight_loop) { | |||
| 93 | 93 | ||
| 94 | if (IsMainCore()) { | 94 | if (IsMainCore()) { |
| 95 | // TODO(Subv): Only let CoreTiming idle if all 4 cores are idling. | 95 | // TODO(Subv): Only let CoreTiming idle if all 4 cores are idling. |
| 96 | CoreTiming::Idle(); | 96 | Timing::Idle(); |
| 97 | CoreTiming::Advance(); | 97 | Timing::Advance(); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | PrepareReschedule(); | 100 | PrepareReschedule(); |
| 101 | } else { | 101 | } else { |
| 102 | if (IsMainCore()) { | 102 | if (IsMainCore()) { |
| 103 | CoreTiming::Advance(); | 103 | Timing::Advance(); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | if (tight_loop) { | 106 | if (tight_loop) { |