mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-08-27 15:31:28 +02:00
parent ed14651b2e
commit 7e939b1b6b
1 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
frontend/menu/backend/menu_common_backend.c
View File

@ -1064,61 +1064,57 @@ static int menu_start_screen_iterate(unsigned action)
static unsigned menu_common_type_is(unsigned type)
{
bool type_found =
type == MENU_SETTINGS ||
type == MENU_SETTINGS_GENERAL_OPTIONS ||
type == MENU_SETTINGS_CORE_OPTIONS ||
type == MENU_SETTINGS_CORE_INFO ||
type == MENU_SETTINGS_VIDEO_OPTIONS ||
type == MENU_SETTINGS_FONT_OPTIONS ||
type == MENU_SETTINGS_SHADER_OPTIONS ||
type == MENU_SETTINGS_SHADER_PARAMETERS ||
type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS ||
type == MENU_SETTINGS_AUDIO_OPTIONS ||
type == MENU_SETTINGS_DISK_OPTIONS ||
type == MENU_SETTINGS_PATH_OPTIONS ||
type == MENU_SETTINGS_PRIVACY_OPTIONS ||
type == MENU_SETTINGS_OVERLAY_OPTIONS ||
type == MENU_SETTINGS_USER_OPTIONS ||
type == MENU_SETTINGS_NETPLAY_OPTIONS ||
type == MENU_SETTINGS_OPTIONS ||
type == MENU_SETTINGS_DRIVERS ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND ||
(type == MENU_SETTINGS_INPUT_OPTIONS);
if (
type == MENU_SETTINGS ||
type == MENU_SETTINGS_GENERAL_OPTIONS ||
type == MENU_SETTINGS_CORE_OPTIONS ||
type == MENU_SETTINGS_CORE_INFO ||
type == MENU_SETTINGS_VIDEO_OPTIONS ||
type == MENU_SETTINGS_FONT_OPTIONS ||
type == MENU_SETTINGS_SHADER_OPTIONS ||
type == MENU_SETTINGS_SHADER_PARAMETERS ||
type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS ||
type == MENU_SETTINGS_AUDIO_OPTIONS ||
type == MENU_SETTINGS_DISK_OPTIONS ||
type == MENU_SETTINGS_PATH_OPTIONS ||
type == MENU_SETTINGS_PRIVACY_OPTIONS ||
type == MENU_SETTINGS_OVERLAY_OPTIONS ||
type == MENU_SETTINGS_USER_OPTIONS ||
type == MENU_SETTINGS_NETPLAY_OPTIONS ||
type == MENU_SETTINGS_OPTIONS ||
type == MENU_SETTINGS_DRIVERS ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_LIBRETRO ||
type == MENU_SETTINGS_PERFORMANCE_COUNTERS_FRONTEND ||
type == MENU_SETTINGS_INPUT_OPTIONS
)
return MENU_SETTINGS;
if (type_found)
return MENU_SETTINGS;
type_found = (
type >= MENU_SETTINGS_SHADER_0 &&
type <= MENU_SETTINGS_SHADER_LAST &&
(((type - MENU_SETTINGS_SHADER_0) % 3) == 0)) ||
type == MENU_SETTINGS_SHADER_PRESET;
if (type_found)
if (
(
type >= MENU_SETTINGS_SHADER_0 &&
type <= MENU_SETTINGS_SHADER_LAST &&
(((type - MENU_SETTINGS_SHADER_0) % 3) == 0)) ||
type == MENU_SETTINGS_SHADER_PRESET)
return MENU_SETTINGS_SHADER_OPTIONS;
type_found =
type == MENU_BROWSER_DIR_PATH ||
type == MENU_CONTENT_DIR_PATH ||
type == MENU_ASSETS_DIR_PATH ||
type == MENU_SHADER_DIR_PATH ||
type == MENU_FILTER_DIR_PATH ||
type == MENU_DSP_FILTER_DIR_PATH ||
type == MENU_SAVESTATE_DIR_PATH ||
type == MENU_LIBRETRO_DIR_PATH ||
type == MENU_LIBRETRO_INFO_DIR_PATH ||
type == MENU_CONFIG_DIR_PATH ||
type == MENU_SAVEFILE_DIR_PATH ||
type == MENU_OVERLAY_DIR_PATH ||
type == MENU_SCREENSHOT_DIR_PATH ||
type == MENU_AUTOCONFIG_DIR_PATH ||
type == MENU_EXTRACTION_DIR_PATH ||
type == MENU_SYSTEM_DIR_PATH;
if (type_found)
if (
type == MENU_BROWSER_DIR_PATH ||
type == MENU_CONTENT_DIR_PATH ||
type == MENU_ASSETS_DIR_PATH ||
type == MENU_SHADER_DIR_PATH ||
type == MENU_FILTER_DIR_PATH ||
type == MENU_DSP_FILTER_DIR_PATH ||
type == MENU_SAVESTATE_DIR_PATH ||
type == MENU_LIBRETRO_DIR_PATH ||
type == MENU_LIBRETRO_INFO_DIR_PATH ||
type == MENU_CONFIG_DIR_PATH ||
type == MENU_SAVEFILE_DIR_PATH ||
type == MENU_OVERLAY_DIR_PATH ||
type == MENU_SCREENSHOT_DIR_PATH ||
type == MENU_AUTOCONFIG_DIR_PATH ||
type == MENU_EXTRACTION_DIR_PATH ||
type == MENU_SYSTEM_DIR_PATH)
return MENU_FILE_DIRECTORY;
return 0;
@ -2675,7 +2671,7 @@ static unsigned menu_common_shader_manager_get_type(const struct gfx_shader *sha
if (!shader)
{
RARCH_ERR("Cannot get shader type, shader handle is not initialized.\n");
return type;
return RARCH_SHADER_NONE;
}
for (i = 0; i < shader->passes; i++)