winemac: Simplify and optimize making a GL context current with no view.

If the context is already current, don't do +clearCurrentContext followed by -makeCurrentContext. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Simplify and optimize making a GL context current with no view.
38f579f9 · Ken Thomases · Alexandre Julliard · 96376059 · 38f579f9
Commit 38f579f9 authored Feb 22, 2016 by Ken Thomases Committed by Alexandre Julliard Feb 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

cocoa_opengl.m dlls/winemac.drv/cocoa_opengl.m +9 -9

No files found.
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -227,17 +227,17 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
    {
        WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext];

-        if ([currentContext isKindOfClass:[WineOpenGLContext class]])
-        {
-            [WineOpenGLContext clearCurrentContext];
-            if (currentContext != context)
-                [currentContext removeFromViews:YES];
-        }
+        [context removeFromViews:YES];

-        if (context)
+        if (currentContext != context)
        {
-            [context removeFromViews:YES];
-            [context makeCurrentContext];
+            if (context)
+                [context makeCurrentContext];
+            else
+                [WineOpenGLContext clearCurrentContext];
+
+            if ([currentContext isKindOfClass:[WineOpenGLContext class]])
+                [currentContext removeFromViews:YES];
        }
    }