winemac: Consolidate code paths for clearing the OpenGL context.

We clear it if the context or the view is NULL. If the context is non-NULL, we want to disassociate the views of both the current and passed-in contexts, if they differ.

winemac: Consolidate code paths for clearing the OpenGL context.
2cc53379 · Ken Thomases · Alexandre Julliard · d57a99b4 · 2cc53379
Commit 2cc53379 authored Jan 14, 2014 by Ken Thomases Committed by Alexandre Julliard Jan 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 24 deletions

cocoa_opengl.m dlls/winemac.drv/cocoa_opengl.m +20 -24

No files found.
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
    WineOpenGLContext *context = (WineOpenGLContext*)c;
    NSView* view = (NSView*)v;

-    if (context)
+    if (context && view)
    {
        [context removeFromViews:NO];
-        if (view)
-        {
-            macdrv_add_view_opengl_context(v, c);
-
-            if (context.needsUpdate)
-            {
-                context.needsUpdate = FALSE;
-                [context setView:view];
-                [context setLatentView:nil];
-            }
-            else
-            {
-                if ([context view])
-                    [context clearDrawableLeavingSurfaceOnScreen];
-                [context setLatentView:view];
-            }
+        macdrv_add_view_opengl_context(v, c);

-            [context makeCurrentContext];
-
-            if ([context view])
-                [context clearToBlackIfNeeded];
+        if (context.needsUpdate)
+        {
+            context.needsUpdate = FALSE;
+            [context setView:view];
+            [context setLatentView:nil];
        }
        else
        {
-            [WineOpenGLContext clearCurrentContext];
-            [context removeFromViews:YES];
+            if ([context view])
+                [context clearDrawableLeavingSurfaceOnScreen];
+            [context setLatentView:view];
        }
+
+        [context makeCurrentContext];
+
+        if ([context view])
+            [context clearToBlackIfNeeded];
    }
    else
    {
@@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
        if ([currentContext isKindOfClass:[WineOpenGLContext class]])
        {
            [WineOpenGLContext clearCurrentContext];
-            [currentContext removeFromViews:YES];
+            if (currentContext != context)
+                [currentContext removeFromViews:YES];
        }
+
+        if (context)
+            [context removeFromViews:YES];
    }

    [pool release];