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

Revert "(OSX) Buildfix"

Browse Source 
This reverts commit 13b8d63bc507bbbc976317face649487e5a66d68.
This commit is contained in:
Twinaphex 2019-02-09 22:57:28 +01:00
parent 13b8d63bc5
commit d85385ca8a
1 changed files with 6 additions and 11 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;
backing_scale_def = 1.0f;
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
#ifdef HAVE_COCOA || defined(HAVE_COCOA_METAL)
screen = (BRIDGE RAScreen*)get_chosen_screen();
if (screen)
@ -374,6 +374,7 @@ static bool cocoagl_gfx_ctx_bind_api(void *data,
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;
switch (cocoagl_api)
@ -393,9 +394,7 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
break;
}
case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
if (cocoa_ctx->swap_interval != interval)
{
cocoa_ctx->swap_interval = interval;
@ -403,7 +402,6 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
cocoa_ctx->vk.need_new_swapchain = true;
}
#endif
}
break;
case GFX_CTX_NONE:
default:
@ -772,7 +770,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_ES_API:
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#ifdef (HAVE_OPENGL) || defined(HAVE_OPENGLES)
return (gfx_ctx_proc_t)
CFBundleGetFunctionPointerForName(
CFBundleGetBundleWithIdentifier(GLFrameworkID),
@ -791,6 +789,7 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
{
unsigned new_width, new_height;
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
*quit = false;
@ -800,12 +799,9 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
case GFX_CTX_OPENGL_ES_API:
break;
case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
*resize = cocoa_ctx->vk.need_new_swapchain;
#endif
}
break;
case GFX_CTX_NONE:
default:
@ -876,15 +872,15 @@ static void cocoagl_gfx_ctx_set_flags(void *data, uint32_t flags)
static bool cocoagl_gfx_ctx_set_resize(
void *data, unsigned width, unsigned height)
{
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
switch (cocoagl_api)
{
case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API:
break;
case GFX_CTX_VULKAN_API:
{
#ifdef HAVE_VULKAN
cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
cocoa_ctx->width = width;
cocoa_ctx->height = height;
@ -903,7 +899,6 @@ static bool cocoagl_gfx_ctx_set_resize(
cocoa_ctx->vk.need_new_swapchain = false;
#endif
}
break;
case GFX_CTX_NONE:
default: