From 91205d17f69806e09176df204167c2a5b9adef62 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 15 Sep 2020 18:59:27 +0200 Subject: [PATCH] Cut down on else codeblock here - it's identical --- ui/drivers/cocoa/cocoa_common.m | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 2495aa1899..984db9a94a 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -32,8 +32,6 @@ #include "apple_platform.h" #endif - - /* forward declarations */ void cocoagl_gfx_ctx_update(void); void *glkitview_init(void); @@ -88,7 +86,7 @@ void *glkitview_init(void); [self registerForDraggedTypes:@[NSColorPboardType, NSFilenamesPboardType]]; #elif defined(HAVE_COCOATOUCH) #if defined(HAVE_COCOA_METAL) - self.view = [UIView new]; + self.view = [UIView new]; #else self.view = (BRIDGE GLKView*)glkitview_init(); #endif @@ -100,11 +98,7 @@ void *glkitview_init(void); #endif #endif -#if defined(HAVE_COCOA) - video_driver_display_type_set(RARCH_DISPLAY_OSX); - video_driver_display_set(0); - video_driver_display_userdata_set((uintptr_t)self); -#elif defined(HAVE_COCOA_METAL) +#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) video_driver_display_type_set(RARCH_DISPLAY_OSX); video_driver_display_set(0); video_driver_display_userdata_set((uintptr_t)self);