From 204c031fefbec75c75711f7574f9d5b4f0ee051f Mon Sep 17 00:00:00 2001
From: merry <git@mary.rs>
Date: Fri, 2 Dec 2022 13:37:22 +0000
Subject: SDL2Driver: Invoke dispatcher on main thread (#3818)

---
 Ryujinx.Headless.SDL2/Program.cs    | 11 +----------
 Ryujinx.Headless.SDL2/WindowBase.cs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'Ryujinx.Headless.SDL2')

diff --git a/Ryujinx.Headless.SDL2/Program.cs b/Ryujinx.Headless.SDL2/Program.cs
index 168e826f..bfc33edc 100644
--- a/Ryujinx.Headless.SDL2/Program.cs
+++ b/Ryujinx.Headless.SDL2/Program.cs
@@ -638,16 +638,7 @@ namespace Ryujinx.Headless.SDL2
 
             Translator.IsReadyForTranslation.Reset();
 
-            Thread windowThread = new Thread(() =>
-            {
-                ExecutionEntrypoint();
-            })
-            {
-                Name = "GUI.WindowThread"
-            };
-
-            windowThread.Start();
-            windowThread.Join();
+            ExecutionEntrypoint();
 
             return true;
         }
diff --git a/Ryujinx.Headless.SDL2/WindowBase.cs b/Ryujinx.Headless.SDL2/WindowBase.cs
index 2d6963dd..9aa17936 100644
--- a/Ryujinx.Headless.SDL2/WindowBase.cs
+++ b/Ryujinx.Headless.SDL2/WindowBase.cs
@@ -168,14 +168,6 @@ namespace Ryujinx.Headless.SDL2
 
         public void Render()
         {
-            InitializeWindowRenderer();
-
-            Device.Gpu.Renderer.Initialize(_glLogLevel);
-
-            InitializeRenderer();
-
-            _gpuVendorName = GetGpuVendorName();
-
             Device.Gpu.Renderer.RunLoop(() =>
             {
                 Device.Gpu.SetGpuThread();
@@ -323,6 +315,14 @@ namespace Ryujinx.Headless.SDL2
 
             InitializeWindow();
 
+            InitializeWindowRenderer();
+
+            Device.Gpu.Renderer.Initialize(_glLogLevel);
+
+            InitializeRenderer();
+
+            _gpuVendorName = GetGpuVendorName();
+
             Thread renderLoopThread = new Thread(Render)
             {
                 Name = "GUI.RenderLoop"
-- 
cgit v1.2.3