add some more context switches, idk

MakieOrg · Dec 29, 2024 · 5eeb34d · 5eeb34d
1 parent 772db38
commit 5eeb34d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/GLMakie/src/postprocessing.jl b/GLMakie/src/postprocessing.jl
@@ -60,6 +60,7 @@ GLRenderPipeline() = GLRenderPipeline(Makie.Pipeline(), AbstractRenderStep[])
 
 function render_frame(screen, glscene, pipeline::GLRenderPipeline)
     for step in pipeline.steps
+        ShaderAbstractions.switch_context!(screen.glscreen)
         run_step(screen, glscene, step)
     end
     return

diff --git a/GLMakie/src/render_pipeline.jl b/GLMakie/src/render_pipeline.jl
@@ -67,6 +67,7 @@ function gl_render_pipeline!(screen::Screen, pipeline::Makie.Pipeline)
     # Maybe safer to wait on rendertask to finish and replace the GLRenderPipeline
     # with an empty one while we mess with it?
     wait(screen)
+    ShaderAbstractions.switch_context!(screen.glscreen)
     screen.render_pipeline = GLRenderPipeline()
 
     # Resolve pipeline

diff --git a/GLMakie/src/screen.jl b/GLMakie/src/screen.jl
@@ -634,9 +634,10 @@ function destroy!(screen::Screen)
     window = screen.glscreen
     GLFW.SetWindowRefreshCallback(window, nothing)
     GLFW.SetWindowContentScaleCallback(window, nothing)
-    destroy!(window)
+    ShaderAbstractions.switch_context!(screen.glscreen)
     destroy!(screen.framebuffer_factory)
     destroy!(screen.render_pipeline)
+    destroy!(window)
     # Since those are sets, we can just delete them from there, even if they weren't in there (e.g. reuse=false)
     delete!(SCREEN_REUSE_POOL, screen)
     delete!(ALL_SCREENS, screen)