From 3d17cf1e38c0a1b613846d26696d91d3757e23dc Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Mon, 18 Jan 2021 19:17:12 +0100
Subject: [PATCH] Move nsview_set/get/cocoaview_get to cocoa_common.m

---
 gfx/drivers_context/cocoa_gl_ctx.m | 25 -------------------------
 ui/drivers/cocoa/cocoa_common.m    | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index c205159c9d..cba9ca83f6 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -85,7 +85,6 @@ static unsigned g_major             = 0;
 #ifdef OSX
 static NSOpenGLPixelFormat* g_format;
 #endif
-static CocoaView* g_instance;
 #if defined(HAVE_COCOATOUCH)
 static GLKView *glk_view            = NULL;
 
@@ -106,30 +105,6 @@ static GLKView *glk_view            = NULL;
 @end
 #endif
 
-void *nsview_get_ptr(void)
-{
-#if defined(OSX)
-   video_driver_display_type_set(RARCH_DISPLAY_OSX);
-   video_driver_display_set(0);
-   video_driver_display_userdata_set((uintptr_t)g_instance);
-#endif
-   return (BRIDGE void *)g_instance;
-}
-
-void nsview_set_ptr(CocoaView *p) { g_instance = p; }
-
-CocoaView *cocoaview_get(void)
-{
-#if defined(HAVE_COCOA_METAL)
-   return (CocoaView*)apple_platform.renderView;
-#elif defined(HAVE_COCOA)
-   return g_instance;
-#else
-   /* TODO/FIXME - implement */
-   return NULL;
-#endif
-}
-
 static uint32_t cocoa_gl_gfx_ctx_get_flags(void *data)
 {
    uint32_t flags                 = 0;
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 5ca07b5f59..1246d97139 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -29,6 +29,8 @@
 #include "apple_platform.h"
 #endif
 
+static CocoaView* g_instance;
+
 /* forward declarations */
 void cocoa_gl_gfx_ctx_update(void);
 
@@ -411,3 +413,27 @@ float cocoa_screen_get_native_scale(void)
     return ret;
 }
 #endif
+
+void *nsview_get_ptr(void)
+{
+#if defined(OSX)
+    video_driver_display_type_set(RARCH_DISPLAY_OSX);
+    video_driver_display_set(0);
+    video_driver_display_userdata_set((uintptr_t)g_instance);
+#endif
+    return (BRIDGE void *)g_instance;
+}
+
+void nsview_set_ptr(CocoaView *p) { g_instance = p; }
+
+CocoaView *cocoaview_get(void)
+{
+#if defined(HAVE_COCOA_METAL)
+    return (CocoaView*)apple_platform.renderView;
+#elif defined(HAVE_COCOA)
+    return g_instance;
+#else
+    /* TODO/FIXME - implement */
+    return NULL;
+#endif
+}