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

(OSX) Buildfix

This commit is contained in:
Twinaphex 2019-02-09 22:56:49 +01:00
parent 08bd58e0c4
commit 13b8d63bc5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -209,7 +209,7 @@ float get_backing_scale_factor(void)
return backing_scale_def; return backing_scale_def;
backing_scale_def = 1.0f; backing_scale_def = 1.0f;
#ifdef HAVE_COCOA || defined(HAVE_COCOA_METAL) #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
screen = (BRIDGE RAScreen*)get_chosen_screen(); screen = (BRIDGE RAScreen*)get_chosen_screen();
if (screen) if (screen)
@ -374,7 +374,6 @@ static bool cocoagl_gfx_ctx_bind_api(void *data,
static void cocoagl_gfx_ctx_swap_interval(void *data, int i) static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
{ {
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
unsigned interval = (unsigned)i; unsigned interval = (unsigned)i;
switch (cocoagl_api) switch (cocoagl_api)
@ -394,7 +393,9 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
break; break;
} }
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
if (cocoa_ctx->swap_interval != interval) if (cocoa_ctx->swap_interval != interval)
{ {
cocoa_ctx->swap_interval = interval; cocoa_ctx->swap_interval = interval;
@ -402,6 +403,7 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
cocoa_ctx->vk.need_new_swapchain = true; cocoa_ctx->vk.need_new_swapchain = true;
} }
#endif #endif
}
break; break;
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default:
@ -770,7 +772,7 @@ static gfx_ctx_proc_t cocoagl_gfx_ctx_get_proc_address(const char *symbol_name)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef (HAVE_OPENGL) || defined(HAVE_OPENGLES) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
return (gfx_ctx_proc_t) return (gfx_ctx_proc_t)
CFBundleGetFunctionPointerForName( CFBundleGetFunctionPointerForName(
CFBundleGetBundleWithIdentifier(GLFrameworkID), CFBundleGetBundleWithIdentifier(GLFrameworkID),
@ -789,7 +791,6 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
bool *resize, unsigned *width, unsigned *height, bool is_shutdown) bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
{ {
unsigned new_width, new_height; unsigned new_width, new_height;
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
*quit = false; *quit = false;
@ -799,9 +800,12 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
break; break;
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
*resize = cocoa_ctx->vk.need_new_swapchain; *resize = cocoa_ctx->vk.need_new_swapchain;
#endif #endif
}
break; break;
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default:
@ -872,15 +876,15 @@ static void cocoagl_gfx_ctx_set_flags(void *data, uint32_t flags)
static bool cocoagl_gfx_ctx_set_resize( static bool cocoagl_gfx_ctx_set_resize(
void *data, unsigned width, unsigned height) void *data, unsigned width, unsigned height)
{ {
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
switch (cocoagl_api) switch (cocoagl_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
break; break;
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
cocoa_ctx->width = width; cocoa_ctx->width = width;
cocoa_ctx->height = height; cocoa_ctx->height = height;
@ -899,6 +903,7 @@ static bool cocoagl_gfx_ctx_set_resize(
cocoa_ctx->vk.need_new_swapchain = false; cocoa_ctx->vk.need_new_swapchain = false;
#endif #endif
}
break; break;
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default: