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

Cleanups/warning fixes - compilation fix for OSX PPC

Browse Source
This commit is contained in:
twinaphex 2019-10-05 18:38:17 +02:00
parent 908974dfe4
commit 221df13250
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -480,19 +480,20 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned
{ {
float screenscale = cocoagl_gfx_ctx_get_native_scale(); float screenscale = cocoagl_gfx_ctx_get_native_scale();
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
CGRect size; CGRect size, cgrect;
GLsizei backingPixelWidth, backingPixelHeight; GLsizei backingPixelWidth, backingPixelHeight;
#if defined(HAVE_COCOA_METAL) #if defined(HAVE_COCOA_METAL)
NSView *g_view = apple_platform.renderView; NSView *g_view = apple_platform.renderView;
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
CocoaView *g_view = g_instance; CocoaView *g_view = g_instance;
#endif #endif
CGRect cgrect = NSRectToCGRect([g_view frame]);
#if MAC_OS_X_VERSION_10_7 #if MAC_OS_X_VERSION_10_7
SEL selector = NSSelectorFromString(BOXSTRING("convertRectToBacking:")); SEL selector = NSSelectorFromString(BOXSTRING("convertRectToBacking:"));
if ([g_view respondsToSelector:selector]) if ([g_view respondsToSelector:selector])
cgrect = NSRectToCGRect([g_view convertRectToBacking:[g_view bounds]]); cgrect = NSRectToCGRect([g_view convertRectToBacking:[g_view bounds]]);
else
#endif #endif
cgrect = NSRectToCGRect([g_view frame]);
backingPixelWidth = CGRectGetWidth(cgrect); backingPixelWidth = CGRectGetWidth(cgrect);
backingPixelHeight = CGRectGetHeight(cgrect); backingPixelHeight = CGRectGetHeight(cgrect);
size = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight); size = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight);

2
gfx/video_shader_parse.c
View File

@ -1168,7 +1168,7 @@ const char *video_shader_to_str(enum rarch_shader_type type)
bool video_shader_is_supported(enum rarch_shader_type type) bool video_shader_is_supported(enum rarch_shader_type type)
{ {
gfx_ctx_flags_t flags; gfx_ctx_flags_t flags;
enum display_flags testflag; enum display_flags testflag = GFX_CTX_FLAGS_NONE;
flags.flags = 0; flags.flags = 0;

4
retroarch.c
View File

@ -2933,6 +2933,7 @@ static void handle_translation_cb(
video_driver_frame(raw_output_data, image_width, image_height, pitch); video_driver_frame(raw_output_data, image_width, image_height, pitch);
} }
#ifdef HAVE_AUDIOMIXER
if (raw_sound_data) if (raw_sound_data)
{ {
audio_mixer_stream_params_t params; audio_mixer_stream_params_t params;
@ -2965,6 +2966,7 @@ static void handle_translation_cb(
free(params.basename); free(params.basename);
free(img); free(img);
} }
#endif
finish: finish:
if (error) if (error)
@ -10863,7 +10865,7 @@ static void input_overlay_auto_rotate(input_overlay_t *ol)
enum overlay_orientation active_overlay_orientation = OVERLAY_ORIENTATION_NONE; enum overlay_orientation active_overlay_orientation = OVERLAY_ORIENTATION_NONE;
bool next_overlay_found = false; bool next_overlay_found = false;
bool tmp = false; bool tmp = false;
unsigned next_overlay_index; unsigned next_overlay_index = 0;
size_t i; size_t i;
/* Sanity check */ /* Sanity check */

3
retroarch.h
View File

@ -856,7 +856,8 @@ enum display_metric_types
enum display_flags enum display_flags
{ {
GFX_CTX_FLAGS_GL_CORE_CONTEXT = 0, GFX_CTX_FLAGS_NONE = 0,
GFX_CTX_FLAGS_GL_CORE_CONTEXT,
GFX_CTX_FLAGS_MULTISAMPLING, GFX_CTX_FLAGS_MULTISAMPLING,
GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES, GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES,
GFX_CTX_FLAGS_HARD_SYNC, GFX_CTX_FLAGS_HARD_SYNC,