parent
d3da2e2616
commit
d1edfabddb
|
@ -62,9 +62,6 @@
|
||||||
#define UIUserInterfaceIdiomCarPlay 3
|
#define UIUserInterfaceIdiomCarPlay 3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* forward declarations */
|
|
||||||
void cocoagl_gfx_ctx_show_mouse(void *data, bool state);
|
|
||||||
|
|
||||||
@interface EAGLContext (OSXCompat) @end
|
@interface EAGLContext (OSXCompat) @end
|
||||||
@implementation EAGLContext (OSXCompat)
|
@implementation EAGLContext (OSXCompat)
|
||||||
+ (void)clearCurrentContext { [EAGLContext setCurrentContext:nil]; }
|
+ (void)clearCurrentContext { [EAGLContext setCurrentContext:nil]; }
|
||||||
|
@ -321,6 +318,17 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
|
||||||
#endif
|
#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,
|
static bool cocoagl_gfx_ctx_set_video_mode(void *data,
|
||||||
video_frame_info_t *video_info,
|
video_frame_info_t *video_info,
|
||||||
|
|
|
@ -120,8 +120,7 @@ void *glcontext_get_ptr(void)
|
||||||
static unsigned g_minor = 0;
|
static unsigned g_minor = 0;
|
||||||
static unsigned g_major = 0;
|
static unsigned g_major = 0;
|
||||||
|
|
||||||
/* forward declarations */
|
/* forward declaration */
|
||||||
void cocoagl_gfx_ctx_show_mouse(void *data, bool state);
|
|
||||||
void *nsview_get_ptr(void);
|
void *nsview_get_ptr(void);
|
||||||
|
|
||||||
#if defined(HAVE_COCOATOUCH)
|
#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,
|
static bool cocoagl_gfx_ctx_set_video_mode(void *data,
|
||||||
video_frame_info_t *video_info,
|
video_frame_info_t *video_info,
|
||||||
unsigned width, unsigned height, bool fullscreen)
|
unsigned width, unsigned height, bool fullscreen)
|
||||||
|
|
|
@ -568,18 +568,6 @@ static CLLocationAccuracy currentVerticalAccuracy;
|
||||||
|
|
||||||
@end
|
@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
|
#ifdef HAVE_AVFOUNDATION
|
||||||
typedef struct apple_camera
|
typedef struct apple_camera
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue