GLInterface::AGL: refactor some functions

Source/Core/Common/GL/GLInterface/AGL.mm

@@ -5,6 +5,45 @@
 #include "Common/GL/GLInterface/AGL.h"
 #include "Common/Logging/Log.h"
 
+static bool DimensionsWereUpdated(NSView* view, u32* width, u32* height)
+{
+  NSWindow* window = [view window];
+  NSSize size = [view frame].size;
+
+  float scale = [window backingScaleFactor];
+  size.width *= scale;
+  size.height *= scale;
+
+  if (*width == size.width && *height == size.height)
+    return false;
+
+  *width = size.width;
+  *height = size.height;
+
+  return true;
+}
+
+static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* width, u32* height)
+{
+  // Enable high-resolution display support.
+  [view setWantsBestResolutionOpenGLSurface:YES];
+
+  NSWindow* window = [view window];
+  if (window == nil)
+  {
+    ERROR_LOG(VIDEO, "failed to create window");
+    return false;
+  }
+
+  (void)DimensionsWereUpdated(view, width, height);
+
+  [window makeFirstResponder:view];
+  [context setView:view];
+  [window makeKeyAndOrderFront:nil];
+
+  return true;
+}
+
 void cInterfaceAGL::Swap()
 {
   [cocoaCtx flushBuffer];
@@ -33,36 +72,11 @@
     return false;
   }
 
-  if (window_handle)
-  {
-    cocoaWin = reinterpret_cast<NSView*>(window_handle);
-    NSSize size = [cocoaWin frame].size;
-
-    // Enable high-resolution display support.
-    [cocoaWin setWantsBestResolutionOpenGLSurface:YES];
-
-    NSWindow* window = [cocoaWin window];
-
-    float scale = [window backingScaleFactor];
-    size.width *= scale;
-    size.height *= scale;
-
-    // Control window size and picture scaling
-    s_backbuffer_width = size.width;
-    s_backbuffer_height = size.height;
-
-    if (cocoaWin == nil)
-    {
-      ERROR_LOG(VIDEO, "failed to create window");
-      return false;
-    }
+  if (!window_handle)
+    return true;
 
-    [window makeFirstResponder:cocoaWin];
-    [cocoaCtx setView:cocoaWin];
-    [window makeKeyAndOrderFront:nil];
-  }
-
-  return true;
+  cocoaWin = static_cast<NSView*>(window_handle);
+  return AttachContextToView(cocoaCtx, cocoaWin, &s_backbuffer_width, &s_backbuffer_height);
 }
 
 bool cInterfaceAGL::MakeCurrent()
@@ -87,23 +101,11 @@
 
 void cInterfaceAGL::Update()
 {
-  if (cocoaWin)
-  {
-    NSWindow* window = [cocoaWin window];
-    NSSize size = [cocoaWin frame].size;
-
-    float scale = [window backingScaleFactor];
-    size.width *= scale;
-    size.height *= scale;
-
-    if (s_backbuffer_width == size.width && s_backbuffer_height == size.height)
-      return;
-
-    s_backbuffer_width = size.width;
-    s_backbuffer_height = size.height;
-  }
+  if (!cocoaWin)
+    return;
 
-  [cocoaCtx update];
+  if (DimensionsWereUpdated(cocoaWin, &s_backbuffer_width, &s_backbuffer_height))
+    [cocoaCtx update];
 }
 
 void cInterfaceAGL::SwapInterval(int interval)