diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-06-05 01:41:48 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-06-05 01:44:05 +0200 |
| commit | 79189c7e3edfd2d628a927ea4be707eb0deeb4e3 (patch) | |
| tree | 222036bfb19793d30eb7cf474258116ba9b226c4 /src/core/core_timing_util.cpp | |
| parent | Merge pull request #2525 from FearlessTobi/remove-unused-settings (diff) | |
| download | yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar.gz yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar.bz2 yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar.lz yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar.xz yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.tar.zst yuzu-79189c7e3edfd2d628a927ea4be707eb0deeb4e3.zip | |
Diffstat (limited to 'src/core/core_timing_util.cpp')
| -rw-r--r-- | src/core/core_timing_util.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp index c0f08cddb..4d73a0d89 100644 --- a/src/core/core_timing_util.cpp +++ b/src/core/core_timing_util.cpp @@ -26,15 +26,7 @@ s64 usToCycles(s64 us) { } s64 usToCycles(u64 us) { - if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { - LOG_ERROR(Core_Timing, "Integer overflow, use max value"); - return std::numeric_limits<s64>::max(); - } - if (us > MAX_VALUE_TO_MULTIPLY) { - LOG_DEBUG(Core_Timing, "Time very big, do rounding"); - return BASE_CLOCK_RATE * static_cast<s64>(us / 1000000); - } - return (BASE_CLOCK_RATE * static_cast<s64>(us)) / 1000000; + return usToCycles(static_cast<s64>(us)); } s64 nsToCycles(s64 ns) { @@ -50,15 +42,7 @@ s64 nsToCycles(s64 ns) { } s64 nsToCycles(u64 ns) { - if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) { - LOG_ERROR(Core_Timing, "Integer overflow, use max value"); - return std::numeric_limits<s64>::max(); - } - if (ns > MAX_VALUE_TO_MULTIPLY) { - LOG_DEBUG(Core_Timing, "Time very big, do rounding"); - return BASE_CLOCK_RATE * (static_cast<s64>(ns) / 1000000000); - } - return (BASE_CLOCK_RATE * static_cast<s64>(ns)) / 1000000000; + return nsToCycles(static_cast<s64>(ns)); } u64 CpuCyclesToClockCycles(u64 ticks) { |