mirror of
https://github.com/libretro/RetroArch
synced 2025-03-03 04:14:00 +00:00
(Cocoa) Move nsview_get_ptr and nsview_set_ptr to cocoa_gl_ctx.m
This commit is contained in:
parent
1ddd7ee79d
commit
4f564360e7
@ -93,8 +93,27 @@ static unsigned g_major = 0;
|
||||
@end
|
||||
#endif
|
||||
|
||||
/* forward declaration */
|
||||
void *nsview_get_ptr(void);
|
||||
static CocoaView* g_instance;
|
||||
|
||||
void *nsview_set_ptr(void *inst)
|
||||
{
|
||||
g_instance = (BRIDGE void*)inst;
|
||||
return (BRIDGE void *)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;
|
||||
}
|
||||
|
||||
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
|
||||
static NSOpenGLPixelFormat* g_format;
|
||||
@ -167,7 +186,7 @@ void *glkitview_init(void)
|
||||
|
||||
return (BRIDGE void *)((GLKView*)g_view);
|
||||
#else
|
||||
return nsview_get_ptr();
|
||||
return nsview_get_ptr();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -144,4 +144,8 @@ extern apple_frontend_settings_t apple_frontend_settings;
|
||||
|
||||
void *get_chosen_screen(void);
|
||||
|
||||
void *nsview_set_ptr(void *inst);
|
||||
|
||||
void *nsview_get_ptr(void);
|
||||
|
||||
#endif
|
||||
|
@ -31,28 +31,6 @@
|
||||
#import "WebServer.h"
|
||||
#endif
|
||||
|
||||
static CocoaView* g_instance;
|
||||
|
||||
void *nsview_set_ptr(void *inst)
|
||||
{
|
||||
g_instance = (BRIDGE void*)inst;
|
||||
return (BRIDGE void *)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;
|
||||
}
|
||||
|
||||
/* forward declarations */
|
||||
void cocoagl_gfx_ctx_update(void);
|
||||
void *glkitview_init(void);
|
||||
|
Loading…
x
Reference in New Issue
Block a user