CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-05 09:57:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Remove shader_dir from default_paths struct

Browse Source
This commit is contained in:
twinaphex 2013-04-06 22:16:12 +02:00
parent cc05981455
commit bcbac5aac7
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
console/rarch_console.h
View File

@ -37,9 +37,6 @@ typedef struct
char screenshots_dir[MAXIMUM_PATH];
char port_dir[MAXIMUM_PATH];
char savestate_dir[MAXIMUM_PATH];
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
char shader_dir[MAXIMUM_PATH];
#endif
char sram_dir[MAXIMUM_PATH];
char system_dir[MAXIMUM_PATH];
} default_paths_t;

2
frontend/menu/rmenu.c
View File

@ -1583,7 +1583,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{
menu_stack_push(SHADER_CHOICE);
filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, default_paths.shader_dir);
filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, g_settings.video.shader_dir);
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_FIRST_SHADER);
}
if (input & (1ULL << RMENU_DEVICE_NAV_START))

2
frontend/platform/platform_ps3.c
View File

@ -295,7 +295,7 @@ static void get_environment_settings(int argc, char *argv[])
snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir);
snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir);
#if defined(HAVE_CG) || defined(HAVE_GLSL)
snprintf(default_paths.shader_dir, sizeof(default_paths.shader_dir), "%s/shaders", default_paths.core_dir);
snprintf(g_settings.video.shader_dir, sizeof(g_settings.video.shader_dir), "%s/shaders", default_paths.core_dir);
#endif
#ifdef IS_SALAMANDER