yuzu: settings: Remove framerate cap and merge unlocked framerate setting.

- These were all somewhat redundant.

1 files changed, 10 insertions, 8 deletions

diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index f92d6beb5..798c4d3a7 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -287,16 +287,18 @@ s64 NVFlinger::GetNextTicks() const {
     static constexpr s64 max_hertz = 120LL;
 
     const auto& settings = Settings::values;
-    const bool unlocked_fps = settings.disable_fps_limit.GetValue();
-    const s64 fps_cap = unlocked_fps ? static_cast<s64>(settings.fps_cap.GetValue()) : 1;
     auto speed_scale = 1.f;
-    if (settings.use_speed_limit.GetValue() && settings.use_multi_core.GetValue()) {
-        // Scales the speed based on speed_limit setting on MC. SC is handled by
-        // SpeedLimiter::DoSpeedLimiting.
-        speed_scale = 100.f / settings.speed_limit.GetValue();
+    if (settings.use_multi_core.GetValue()) {
+        if (settings.use_speed_limit.GetValue()) {
+            // Scales the speed based on speed_limit setting on MC. SC is handled by
+            // SpeedLimiter::DoSpeedLimiting.
+            speed_scale = 100.f / settings.speed_limit.GetValue();
+        } else {
+            // Run at unlocked framerate.
+            speed_scale = 0.01f;
+        }
     }
-    return static_cast<s64>(((1000000000 * (1LL << swap_interval)) / (max_hertz * fps_cap)) *
-                            speed_scale);
+    return static_cast<s64>(((1000000000 * (1LL << swap_interval)) / max_hertz) * speed_scale);
 }
 
 } // namespace Service::NVFlinger