mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) Fix ARC issues

Browse Source
This commit is contained in:
Twinaphex 2016-01-14 07:03:35 +01:00
parent 3eb6ef0251
commit 50a7686931
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -129,12 +129,20 @@ void *get_chosen_screen(void)
if (settings->video.monitor_index >= RAScreen.screens.count)
{
RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead.\n");
#if __has_feature(objc_arc)
return (__bridge void*)RAScreen.mainScreen;
#else
return (void*)RAScreen.mainScreen;
#endif
}
NSArray *screens = [RAScreen screens];
#if __has_feature(objc_arc)
return ((__bridge void*)[screens objectAtIndex:settings->video.monitor_index]);
#else
return ((void*)[screens objectAtIndex:settings->video.monitor_index]);
#endif
#endif
}
void cocoagl_gfx_ctx_update(void)
@ -317,7 +325,11 @@ float cocoagl_gfx_ctx_get_native_scale(void)
{
static float ret = 0.0f;
SEL selector = NSSelectorFromString(BOXSTRING("nativeScale"));
#if __has_feature(objc_arc)
RAScreen *screen = (__bridge RAScreen*)get_chosen_screen();
#else
RAScreen *screen = (RAScreen*)get_chosen_screen();
#endif
if (ret != 0.0f)
return ret;
@ -335,7 +347,11 @@ float cocoagl_gfx_ctx_get_native_scale(void)
static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned* height)
{
#if __has_feature(objc_arc)
RAScreen *screen = (__bridge RAScreen*)get_chosen_screen();
#else
RAScreen *screen = (RAScreen*)get_chosen_screen();
#endif
CGRect size = screen.bounds;
float screenscale = cocoagl_gfx_ctx_get_native_scale();
@ -381,7 +397,11 @@ static void cocoagl_gfx_ctx_update_window_title(void *data)
static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types type,
float *value)
{
RAScreen *screen = (RAScreen*)get_chosen_screen();
#if __has_feature(objc_arc)
RAScreen *screen = (__bridge RAScreen*)get_chosen_screen();
#else
RAScreen *screen = (RAScreen*)get_chosen_screen();
#endif
#if defined(HAVE_COCOA)
NSDictionary *description = [screen deviceDescription];
NSSize display_pixel_size = [[description objectForKey:NSDeviceSize] sizeValue];