GHOST: Unify behavior of offscreen context creation

This makes sure the previously bound context is restored after creating a
new context. This follows what is already happening on windows.

All system backend are patched.

This also removes the goto and some code duplication.

Differential Revision: https://developer.blender.org/D12455

1 files changed, 10 insertions, 5 deletions

diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 189e663f91a..5a7d6ef2c01 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -767,13 +767,18 @@ GHOST_IWindow *GHOST_SystemCocoa::createWindow(const char *title,
  */
 GHOST_IContext *GHOST_SystemCocoa::createOffscreenContext(GHOST_GLSettings glSettings)
 {
+  NSOpenGLContext *prevContext = [NSOpenGLContext currentContext];
+
   GHOST_Context *context = new GHOST_ContextCGL(false, NULL, NULL, NULL);
-  if (context->initializeDrawingContext())
-    return context;
-  else
+  if (context->initializeDrawingContext() == false) {
     delete context;
-
-  return NULL;
+    context = nullptr;
+  }
+  /* Restore previously bound context. This is just to follow the win32 behavior. */
+  if (prevContext) {
+    [prevContext makeCurrentContext];
+  }
+  return context;
 }
 
 /**