mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move nsview_get_ptr to cocoa_common

Browse Source
This commit is contained in:
twinaphex 2019-11-19 21:13:17 +01:00
parent 387e18b528
commit e3506ed06b
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -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;

4
ui/drivers/cocoa/cocoa_common.h
View File

@ -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

20
ui/drivers/cocoa/cocoa_common.m
View File

@ -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;
}