diff options
| author | 2020-02-15 13:56:50 -0400 | |
|---|---|---|
| committer | 2020-06-18 16:29:22 -0400 | |
| commit | 96b2d8419c94f9bcb5f2f970bbb453aa7383b510 (patch) | |
| tree | 9ca96e9c9ad0f85f57d19f89120ae8c1d6cf11e2 /src/core/host_timing.cpp | |
| parent | Core/HostTiming: Allow events to be advanced manually. (diff) | |
| download | yuzu-96b2d8419c94f9bcb5f2f970bbb453aa7383b510.tar.gz yuzu-96b2d8419c94f9bcb5f2f970bbb453aa7383b510.tar.xz yuzu-96b2d8419c94f9bcb5f2f970bbb453aa7383b510.zip | |
HostTiming: Correct rebase and implement AddTicks.
Diffstat (limited to 'src/core/host_timing.cpp')
| -rw-r--r-- | src/core/host_timing.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/host_timing.cpp b/src/core/host_timing.cpp index 5d35a96b1..2f40de1a1 100644 --- a/src/core/host_timing.cpp +++ b/src/core/host_timing.cpp | |||
| @@ -36,7 +36,8 @@ struct CoreTiming::Event { | |||
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | CoreTiming::CoreTiming() { | 38 | CoreTiming::CoreTiming() { |
| 39 | clock = Common::CreateBestMatchingClock(Core::Timing::BASE_CLOCK_RATE, Core::Timing::CNTFREQ); | 39 | clock = |
| 40 | Common::CreateBestMatchingClock(Core::Hardware::BASE_CLOCK_RATE, Core::Hardware::CNTFREQ); | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | CoreTiming::~CoreTiming() = default; | 43 | CoreTiming::~CoreTiming() = default; |
| @@ -110,6 +111,14 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, u | |||
| 110 | basic_lock.unlock(); | 111 | basic_lock.unlock(); |
| 111 | } | 112 | } |
| 112 | 113 | ||
| 114 | void CoreTiming::AddTicks(std::size_t core_index, u64 ticks) { | ||
| 115 | ticks_count[core_index] += ticks; | ||
| 116 | } | ||
| 117 | |||
| 118 | void CoreTiming::ResetTicks(std::size_t core_index) { | ||
| 119 | ticks_count[core_index] = 0; | ||
| 120 | } | ||
| 121 | |||
| 113 | u64 CoreTiming::GetCPUTicks() const { | 122 | u64 CoreTiming::GetCPUTicks() const { |
| 114 | return clock->GetCPUCycles(); | 123 | return clock->GetCPUCycles(); |
| 115 | } | 124 | } |