Merge pull request #5689 from frenzibyte/fix-veldrid-gl-make-current

Fix draw thread unnecessarily marking GL context as current
ppy · Mar 21, 2023 · 1ff6694 · 1ff6694
2 parents 6d7938d + 03d8a7b
commit 1ff6694
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/osu.Framework/Graphics/OpenGL/GLRenderer.cs b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
@@ -103,6 +103,9 @@ protected internal override void BeginFrame(Vector2 windowSize)
             lastBoundBuffers.AsSpan().Clear();
             lastBoundVertexArray = 0;
 
+            // Seems to be required on some drivers as the context is lost from the draw thread.
+            MakeCurrent();
+
             GL.UseProgram(0);
 
             base.BeginFrame(windowSize);

diff --git a/osu.Framework/Threading/DrawThread.cs b/osu.Framework/Threading/DrawThread.cs
@@ -28,8 +28,6 @@ protected sealed override void OnInitialize()
 
             if (window != null)
             {
-                host.Renderer.MakeCurrent();
-
                 host.Renderer.BeginFrame(new Vector2(window.ClientSize.Width, window.ClientSize.Height));
                 host.Renderer.FinishFrame();
             }
@@ -40,16 +38,13 @@ internal sealed override void MakeCurrent()
             base.MakeCurrent();
 
             ThreadSafety.IsDrawThread = true;
-
-            if (host.Renderer.IsInitialised)
-                // Seems to be required on some drivers as the context is lost from the draw thread.
-                host.Renderer.MakeCurrent();
         }
 
         protected sealed override void OnSuspended()
         {
             base.OnSuspended();
 
+            // if we've acquired the GL context before in this thread, make sure to release it before suspension.
             if (host.Renderer.IsInitialised)
                 host.Renderer.ClearCurrent();
         }