diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index b427b461fd..b3c9a7b60d 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -93,8 +93,26 @@ static unsigned g_major = 0; @end #endif -/* forward declaration */ -void *nsview_get_ptr(void); +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 f7aeb94008..a6667c6c0d 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -144,4 +144,8 @@ 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 307de36934..707581eba6 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -31,26 +31,7 @@ #import "WebServer.h" #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; -} /* forward declarations */ void cocoagl_gfx_ctx_update(void);