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

(OSX) Refactor this so that we always set the userdata 

pointer so we can use the new set_title codepaths - will
have to check how to reduce the overhead in nsview_get_ptr
later
This commit is contained in:
Twinaphex 2019-09-22 10:19:03 +02:00
parent ae21bd98aa
commit 6a9feb7978
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -350,12 +350,6 @@ static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
{ {
const ui_window_t *window = ui_companion_driver_get_window_ptr(); const ui_window_t *window = ui_companion_driver_get_window_ptr();
#if defined(HAVE_COCOA)
void *_data = (CocoaView*)nsview_get_ptr();
#elif defined(HAVE_COCOA_METAL)
void *_data = (BRIDGE void *)apple_platform.renderView;
#endif
if (window) if (window)
{ {
char title[128]; char title[128];
@ -365,7 +359,7 @@ static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
video_driver_get_window_title(title, sizeof(title)); video_driver_get_window_title(title, sizeof(title));
if (title[0]) if (title[0])
window->set_title(_data, title); window->set_title((void*)video_driver_display_userdata_get(), title);
} }
} }
#endif #endif

21
ui/drivers/cocoa/cocoa_common.m
View File

@ -56,6 +56,15 @@ static CocoaView* g_instance;
void *nsview_get_ptr(void) void *nsview_get_ptr(void)
{ {
#if defined(HAVE_COCOA)
video_driver_display_type_set(RARCH_DISPLAY_OSX);
video_driver_display_set(0);
video_driver_display_userdata_set((uintptr_t)g_instance);
#elif defined(HAVE_COCOA_METAL)
video_driver_display_type_set(RARCH_DISPLAY_OSX);
video_driver_display_set(0);
video_driver_display_userdata_set((uintptr_t)g_instance);
#endif
return (BRIDGE void *)g_instance; return (BRIDGE void *)g_instance;
} }
@ -97,7 +106,7 @@ void *glkitview_init(void);
#elif defined(HAVE_COCOA_METAL) #elif defined(HAVE_COCOA_METAL)
video_driver_display_type_set(RARCH_DISPLAY_OSX); video_driver_display_type_set(RARCH_DISPLAY_OSX);
video_driver_display_set(0); video_driver_display_set(0);
video_driver_display_userdata_set((uintptr_t)apple_platform.renderView); video_driver_display_userdata_set((uintptr_t)g_instance);
#endif #endif
return g_instance; return g_instance;
@ -128,6 +137,16 @@ void *glkitview_init(void);
#endif #endif
#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)
video_driver_display_type_set(RARCH_DISPLAY_OSX);
video_driver_display_set(0);
video_driver_display_userdata_set((uintptr_t)self);
#endif
return self; return self;
} }