diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-03 08:08:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 08:08:43 +0100 |
| commit | 88089c87546b62536a27738f5ee03dff52fa76e9 (patch) | |
| tree | 5221c80d0ac3e7bbdb0c342098378e6c84951658 /src/common/x64 | |
| parent | Merge pull request #5002 from ameerj/nvdec-frameskip (diff) | |
| parent | audio_core: Make shadowing and unused parameters errors (diff) | |
| download | yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.gz yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.bz2 yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.lz yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.xz yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.zst yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.zip | |
Diffstat (limited to 'src/common/x64')
| -rw-r--r-- | src/common/x64/native_clock.cpp | 8 | ||||
| -rw-r--r-- | src/common/x64/native_clock.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 424b39b1f..eb8a7782f 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -43,10 +43,10 @@ u64 EstimateRDTSCFrequency() { } namespace X64 { -NativeClock::NativeClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, - u64 rtsc_frequency) - : WallClock(emulated_cpu_frequency, emulated_clock_frequency, true), rtsc_frequency{ - rtsc_frequency} { +NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, + u64 rtsc_frequency_) + : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, true), rtsc_frequency{ + rtsc_frequency_} { _mm_mfence(); last_measure = __rdtsc(); accumulated_ticks = 0U; diff --git a/src/common/x64/native_clock.h b/src/common/x64/native_clock.h index 97aab6ac9..6d1e32ac8 100644 --- a/src/common/x64/native_clock.h +++ b/src/common/x64/native_clock.h @@ -14,7 +14,8 @@ namespace Common { namespace X64 { class NativeClock final : public WallClock { public: - NativeClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, u64 rtsc_frequency); + explicit NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, + u64 rtsc_frequency_); std::chrono::nanoseconds GetTimeNS() override; |