diff options
| author |  Levi | 2021-01-10 22:09:56 -0700 |
|---|---|---|
| committer | Levi | 2021-01-10 22:09:56 -0700 |
| commit | 7a3c884e39fccfbb498b855080bffabc9ce2e7f1 (patch) | |
| tree | 5056f9406dec188439cb0deb87603498243a9412 /src/common/x64/native_clock.cpp | |
| parent | More forgetting... duh (diff) | |
| parent | Merge pull request #5229 from Morph1984/fullscreen-opt (diff) | |
| download | yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.tar.gz yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.tar.xz yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.zip | |
Merge remote-tracking branch 'upstream/master' into int-flags
Diffstat (limited to 'src/common/x64/native_clock.cpp')
| -rw-r--r-- | src/common/x64/native_clock.cpp | 8 |
1 files changed, 4 insertions, 4 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() { | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | namespace X64 { | 45 | namespace X64 { |
| 46 | NativeClock::NativeClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, | 46 | NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, |
| 47 | u64 rtsc_frequency) | 47 | u64 rtsc_frequency_) |
| 48 | : WallClock(emulated_cpu_frequency, emulated_clock_frequency, true), rtsc_frequency{ | 48 | : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, true), rtsc_frequency{ |
| 49 | rtsc_frequency} { | 49 | rtsc_frequency_} { |
| 50 | _mm_mfence(); | 50 | _mm_mfence(); |
| 51 | last_measure = __rdtsc(); | 51 | last_measure = __rdtsc(); |
| 52 | accumulated_ticks = 0U; | 52 | accumulated_ticks = 0U; |