diff options
| author | merry <git@mary.rs> | 2022-12-02 13:37:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 14:37:22 +0100 |
| commit | 204c031fefbec75c75711f7574f9d5b4f0ee051f (patch) | |
| tree | a75d60bd14cd540fec227f26ed91c1e170c661f5 /Ryujinx.Headless.SDL2 | |
| parent | d9053bbe3745846dd758561e24dd060d76b3ad9d (diff) | |
SDL2Driver: Invoke dispatcher on main thread (#3818)
Diffstat (limited to 'Ryujinx.Headless.SDL2')
| -rw-r--r-- | Ryujinx.Headless.SDL2/Program.cs | 11 | ||||
| -rw-r--r-- | Ryujinx.Headless.SDL2/WindowBase.cs | 16 |
2 files changed, 9 insertions, 18 deletions
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" |