mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Simplify code

Browse Source
This commit is contained in:
twinaphex 2015-11-02 22:25:39 +01:00
parent ab230f5169
commit 7b35620859
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu_display.c
View File

@ -658,25 +658,19 @@ void menu_display_texture_unload(uintptr_t *id)
bool menu_display_check_compatibility(enum menu_display_driver_type type) bool menu_display_check_compatibility(enum menu_display_driver_type type)
{ {
const video_driver_t *video_driver = NULL; const char *video_driver = menu_video_get_ident();
switch (type) switch (type)
{ {
case MENU_VIDEO_DRIVER_GENERIC: case MENU_VIDEO_DRIVER_GENERIC:
return true; return true;
case MENU_VIDEO_DRIVER_OPENGL: case MENU_VIDEO_DRIVER_OPENGL:
#ifdef HAVE_OPENGL if (!strcmp(video_driver, "gl"))
{ return true;
gl_t *gl = (gl_t*)video_driver_get_ptr(&video_driver);
if (video_driver == &video_gl || gl)
return true;
}
#endif
break; break;
case MENU_VIDEO_DRIVER_DIRECT3D: case MENU_VIDEO_DRIVER_DIRECT3D:
#ifdef HAVE_D3D if (!strcmp(video_driver, "d3d"))
/* TODO/FIXME */ return true;
#endif
break; break;
} }

18
menu/menu_driver.c
View File

@ -149,7 +149,6 @@ const menu_ctx_driver_t *menu_ctx_driver_get_ptr(void)
void init_menu(void) void init_menu(void)
{ {
const char *video_driver;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (driver->menu) if (driver->menu)
@ -157,21 +156,8 @@ void init_menu(void)
find_menu_driver(); find_menu_driver();
video_driver = menu_video_get_ident(); if (!menu_display_check_compatibility(driver->menu_ctx->type))
init_menu_fallback();
switch (driver->menu_ctx->type)
{
case MENU_VIDEO_DRIVER_GENERIC:
break;
case MENU_VIDEO_DRIVER_DIRECT3D:
if (video_driver && (strcmp(video_driver, "d3d") != 0))
init_menu_fallback();
break;
case MENU_VIDEO_DRIVER_OPENGL:
if (video_driver && (strcmp(video_driver, "gl") != 0))
init_menu_fallback();
break;
}
if (!(driver->menu = (menu_handle_t*)menu_init(driver->menu_ctx))) if (!(driver->menu = (menu_handle_t*)menu_init(driver->menu_ctx)))
retro_fail(1, "init_menu()"); retro_fail(1, "init_menu()");