mirror of
https://github.com/libretro/RetroArch
synced 2025-02-06 18:40:49 +00:00
Revert "Move code to cocoa_common.m"
This reverts commit d3da2e2616a1d9111fd3fda76408ebd65c15f46a.
This commit is contained in:
parent
d3da2e2616
commit
d1edfabddb
@ -62,9 +62,6 @@
|
||||
#define UIUserInterfaceIdiomCarPlay 3
|
||||
#endif
|
||||
|
||||
/* forward declarations */
|
||||
void cocoagl_gfx_ctx_show_mouse(void *data, bool state);
|
||||
|
||||
@interface EAGLContext (OSXCompat) @end
|
||||
@implementation EAGLContext (OSXCompat)
|
||||
+ (void)clearCurrentContext { [EAGLContext setCurrentContext:nil]; }
|
||||
@ -321,6 +318,17 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void cocoagl_gfx_ctx_show_mouse(void *data, bool state)
|
||||
{
|
||||
(void)data;
|
||||
|
||||
#ifdef HAVE_COCOA
|
||||
if (state)
|
||||
[NSCursor unhide];
|
||||
else
|
||||
[NSCursor hide];
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool cocoagl_gfx_ctx_set_video_mode(void *data,
|
||||
video_frame_info_t *video_info,
|
||||
|
@ -120,8 +120,7 @@ void *glcontext_get_ptr(void)
|
||||
static unsigned g_minor = 0;
|
||||
static unsigned g_major = 0;
|
||||
|
||||
/* forward declarations */
|
||||
void cocoagl_gfx_ctx_show_mouse(void *data, bool state);
|
||||
/* forward declaration */
|
||||
void *nsview_get_ptr(void);
|
||||
|
||||
#if defined(HAVE_COCOATOUCH)
|
||||
@ -401,6 +400,18 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int interval)
|
||||
|
||||
}
|
||||
|
||||
static void cocoagl_gfx_ctx_show_mouse(void *data, bool state)
|
||||
{
|
||||
(void)data;
|
||||
|
||||
#ifdef HAVE_COCOA_METAL
|
||||
if (state)
|
||||
[NSCursor unhide];
|
||||
else
|
||||
[NSCursor hide];
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool cocoagl_gfx_ctx_set_video_mode(void *data,
|
||||
video_frame_info_t *video_info,
|
||||
unsigned width, unsigned height, bool fullscreen)
|
||||
|
@ -568,18 +568,6 @@ static CLLocationAccuracy currentVerticalAccuracy;
|
||||
|
||||
@end
|
||||
|
||||
void cocoagl_gfx_ctx_show_mouse(void *data, bool state)
|
||||
{
|
||||
(void)data;
|
||||
|
||||
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
|
||||
if (state)
|
||||
[NSCursor unhide];
|
||||
else
|
||||
[NSCursor hide];
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef HAVE_AVFOUNDATION
|
||||
typedef struct apple_camera
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user