Change TickSource TickMultiplier from static to an instance variable

Ryujinx · Mar 14, 2024 · 25c3b7d · 25c3b7d
1 parent 2339efa
commit 25c3b7d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/Ryujinx.Cpu/ITickSource.cs b/src/Ryujinx.Cpu/ITickSource.cs
@@ -13,6 +13,11 @@ public interface ITickSource : ICounter
         /// </summary>
         TimeSpan ElapsedTime { get; }
 
+        /// <summary>
+        /// Clock tick multiplier, in percent points (100 = 1.0).
+        /// </summary>
+        long TickMultiplier { get; set; }
+
         /// <summary>
         /// Time elapsed since the counter was created, in seconds.
         /// </summary>

diff --git a/src/Ryujinx.Cpu/TickSource.cs b/src/Ryujinx.Cpu/TickSource.cs
@@ -15,15 +15,15 @@ public class TickSource : ITickSource
         /// <inheritdoc/>
         public ulong Counter => (ulong)(ElapsedSeconds * Frequency);
 
-        public static long s_tickMultiplier = 100;
+        public long TickMultiplier { get; set; } = 100;
         private static long AcumElapsedTicks = 0;
         private static long LastElapsedTicks = 0;
         private long Elapsedticks
         {
             get
             {
                 long elapsedTicks = _tickCounter.ElapsedTicks;
-                AcumElapsedTicks += (elapsedTicks - LastElapsedTicks) * s_tickMultiplier / 100;
+                AcumElapsedTicks += (elapsedTicks - LastElapsedTicks) * TickMultiplier / 100;
                 LastElapsedTicks = elapsedTicks;
                 return AcumElapsedTicks;
             }

diff --git a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -89,7 +89,7 @@ private void UpdateSwapInterval(int swapInterval)
             }
             else
             {
-                _ticksPerFrame = (Stopwatch.Frequency / TargetFps * 100) / TickSource.s_tickMultiplier;
+                _ticksPerFrame = (Stopwatch.Frequency / TargetFps * 100) / (_device.System?.TickSource?.TickMultiplier ?? 100);
             }
         }
 

diff --git a/src/Ryujinx.HLE/Switch.cs b/src/Ryujinx.HLE/Switch.cs
@@ -126,6 +126,11 @@ public float GetVolume()
             return AudioDeviceDriver.Volume;
         }
 
+        public void SetTickSourceMultiplier(long tickMultiplier)
+        {
+            System.TickSource.TickMultiplier = tickMultiplier;
+        }
+
         public void EnableCheats()
         {
             ModLoader.EnableCheats(Processes.ActiveApplication.ProgramId, TamperMachine);

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
@@ -1072,7 +1072,7 @@ private bool UpdateFrame()
                     {
                         Device.TurboMode = !Device.TurboMode;
                         long turboMultiplier = Device.TurboMode ? Device.Configuration.TurboMultiplier : 100;
-                        TickSource.s_tickMultiplier = turboMultiplier;
+                        Device.SetTickSourceMultiplier(turboMultiplier);
                     }
                     switch (currentHotkeyState)
                     {