diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index f5ce5d0eb0..d2fb7a046b 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -95,27 +95,6 @@ static unsigned g_major = 0; @end #endif -static CocoaView* g_instance; - -void *nsview_get_ptr(void) -{ -#if defined(HAVE_COCOA) - video_driver_display_type_set(RARCH_DISPLAY_OSX); - video_driver_display_set(0); - video_driver_display_userdata_set((uintptr_t)g_instance); -#elif defined(HAVE_COCOA_METAL) - 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; -} - #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) static NSOpenGLPixelFormat* g_format; diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index a6667c6c0d..f7aeb94008 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -144,8 +144,4 @@ extern apple_frontend_settings_t apple_frontend_settings; void *get_chosen_screen(void); -void *nsview_get_ptr(void); - -void nsview_set_ptr(CocoaView *ptr); - #endif diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 5546c98328..8a40719b26 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -36,6 +36,22 @@ /* forward declarations */ void cocoagl_gfx_ctx_update(void); +static CocoaView* g_instance; + +static CocoaView *nsview_get_ptr(void) +{ +#if defined(HAVE_COCOA) + video_driver_display_type_set(RARCH_DISPLAY_OSX); + video_driver_display_set(0); + video_driver_display_userdata_set((uintptr_t)g_instance); +#elif defined(HAVE_COCOA_METAL) + 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 CocoaView*)g_instance; +} + #if defined(HAVE_COCOATOUCH) static void *glkitview_init(void) { @@ -74,8 +90,8 @@ static void *glkitview_init(void) CocoaView *view = (BRIDGE CocoaView*)nsview_get_ptr(); if (!view) { - view = [CocoaView new]; - nsview_set_ptr(view); + view = [CocoaView new]; + g_instance = view; } return view; }