ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(OSX 10.6) Buildfix

This commit is contained in:
twinaphex 2016-01-13 21:20:50 +01:00
parent f835f8c1c4
commit 3eb6ef0251
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/drivers_context/cocoa_gl_ctx.m
View File

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