From d0cb042ff4b5fbf795de1feff4d8de73d3d41ff1 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 25 Jun 2018 23:48:28 -0300
Subject: [PATCH 1/3] Naive limiter, VSync disabled

---
 Ryujinx/Ui/GLScreen.cs | 39 +++++++++++++++++++++++++++++++++++----
 Ryujinx/Ui/Program.cs  |  2 +-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index ab5eaa0f52..67cea2c6b1 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -5,6 +5,7 @@ using Ryujinx.Graphics.Gal;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Input;
 using System;
+using Stopwatch = System.Diagnostics.Stopwatch;
 
 namespace Ryujinx
 {
@@ -38,14 +39,44 @@ namespace Ryujinx
                 (DisplayDevice.Default.Height / 2) - (Height / 2));
         }
 
-        protected override void OnLoad(EventArgs e)
+        public void MainLoop()
         {
-            VSync = VSyncMode.On;
+            Load();
+
+            Visible = true;
+
+            Stopwatch Chrono = new Stopwatch();
+
+            Chrono.Start();
+
+            long TicksPerFrame = Stopwatch.Frequency / 60;
+
+            while (Exists && !IsExiting)
+            {
+                ProcessEvents();
+
+                if (!IsExiting)
+                {
+                    if (Chrono.ElapsedTicks > TicksPerFrame)
+                    {
+                        UpdateFrame();
+
+                        RenderFrame();
+
+                        Chrono.Restart();
+                    }
+                }
+            }
+        }
+
+        private new void Load()
+        {
+            //VSync = VSyncMode.On;
 
             Renderer.FrameBuffer.SetWindowSize(Width, Height);
         }
 
-        protected override void OnUpdateFrame(FrameEventArgs e)
+        private new void UpdateFrame()
         {
             HidControllerButtons CurrentButton = 0;
             HidJoystickPosition LeftJoystick;
@@ -185,7 +216,7 @@ namespace Ryujinx
             Renderer.RunActions();
         }
 
-        protected override void OnRenderFrame(FrameEventArgs e)
+        private new void RenderFrame()
         {
             Renderer.FrameBuffer.Render();
 
diff --git a/Ryujinx/Ui/Program.cs b/Ryujinx/Ui/Program.cs
index b14897695d..5cacc6228b 100644
--- a/Ryujinx/Ui/Program.cs
+++ b/Ryujinx/Ui/Program.cs
@@ -67,7 +67,7 @@ namespace Ryujinx
                     Screen.Exit();
                 };
 
-                Screen.Run(0.0, 60.0);
+                Screen.MainLoop();
             }
 
             Environment.Exit(0);

From 3671fa1991e863b3aef67e670326d948ba41e0d2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 26 Jun 2018 00:24:57 -0300
Subject: [PATCH 2/3] A little bit less naive limiter

---
 Ryujinx/Ui/GLScreen.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index 67cea2c6b1..cada3c5acf 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -51,19 +51,25 @@ namespace Ryujinx
 
             long TicksPerFrame = Stopwatch.Frequency / 60;
 
+            long Ticks = 0;
+
             while (Exists && !IsExiting)
             {
                 ProcessEvents();
 
                 if (!IsExiting)
                 {
-                    if (Chrono.ElapsedTicks > TicksPerFrame)
-                    {
-                        UpdateFrame();
+                    UpdateFrame();
 
+                    Ticks += Chrono.ElapsedTicks;
+
+                    Chrono.Restart();
+
+                    if (Ticks > TicksPerFrame)
+                    {
                         RenderFrame();
 
-                        Chrono.Restart();
+                        Ticks -= TicksPerFrame;
                     }
                 }
             }

From aa334243ca0a165114a9974d6bfd37ae1ac38bdd Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 26 Jun 2018 01:10:01 -0300
Subject: [PATCH 3/3] VSync was still enabled

---
 Ryujinx/Ui/GLScreen.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index cada3c5acf..6436e95bbc 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -59,25 +59,25 @@ namespace Ryujinx
 
                 if (!IsExiting)
                 {
-                    UpdateFrame();
-
-                    Ticks += Chrono.ElapsedTicks;
-
-                    Chrono.Restart();
-
-                    if (Ticks > TicksPerFrame)
+                    while (Ticks < TicksPerFrame)
                     {
-                        RenderFrame();
+                        UpdateFrame();
 
-                        Ticks -= TicksPerFrame;
+                        Ticks += Chrono.ElapsedTicks;
+
+                        Chrono.Restart();
                     }
+
+                    RenderFrame();
+
+                    Ticks -= TicksPerFrame;
                 }
             }
         }
 
         private new void Load()
         {
-            //VSync = VSyncMode.On;
+            VSync = VSyncMode.Off;
 
             Renderer.FrameBuffer.SetWindowSize(Width, Height);
         }