Changed the order of shader preset directories.

The Menu Config directory now takes precedence over the Video Shader
directory for the storage of shader preset overrides. With this, all
user overrides are grouped by default under the same path.
This commit is contained in:
Joan Coll Cerdán 2020-05-13 19:44:23 +02:00
parent f1f248dd11
commit fe42f6bb73
2 changed files with 10 additions and 10 deletions

View File

@ -290,8 +290,8 @@ static bool menu_shader_manager_save_preset_internal(
path_get(RARCH_PATH_CONFIG),
sizeof(config_directory));
dirs[0] = dir_video_shader;
dirs[1] = dir_menu_config;
dirs[0] = dir_menu_config;
dirs[1] = dir_video_shader;
dirs[2] = config_directory;
for (i = 0; i < ARRAY_SIZE(dirs); i++)
@ -417,8 +417,8 @@ static bool menu_shader_manager_operate_auto_preset(
path_get(RARCH_PATH_CONFIG),
sizeof(config_directory));
dirs[0] = dir_video_shader;
dirs[1] = dir_menu_config;
dirs[0] = dir_menu_config;
dirs[1] = dir_video_shader;
dirs[2] = config_directory;
for (i = 0; i < ARRAY_SIZE(dirs); i++)
@ -474,8 +474,8 @@ static bool menu_shader_manager_operate_auto_preset(
path_get(RARCH_PATH_CONFIG),
sizeof(config_directory));
dirs[0] = dir_video_shader;
dirs[1] = dir_menu_config;
dirs[0] = dir_menu_config;
dirs[1] = dir_video_shader;
dirs[2] = config_directory;
for (i = 0; i < ARRAY_SIZE(dirs); i++)

View File

@ -27321,8 +27321,8 @@ static bool retroarch_load_shader_preset_internal(
* $SHADER_DIR is composed by three different locations which will be searched
* in the following order (search will stop on first match):
*
* 1. The Video Shader directory
* 2. The Menu Config directory
* 1. The Menu Config directory
* 2. The Video Shader directory
* 3. The directory where the configuration file is stored
*
* Note: Uses video_shader_is_supported() which only works after
@ -27376,8 +27376,8 @@ static bool retroarch_load_shader_preset(void)
fill_pathname_basedir(config_file_directory,
path_get(RARCH_PATH_CONFIG), PATH_MAX_LENGTH);
dirs[0] = video_shader_directory;
dirs[1] = menu_config_directory;
dirs[0] = menu_config_directory;
dirs[1] = video_shader_directory;
dirs[2] = config_file_directory;
for (i = 0; i < ARRAY_SIZE(dirs); i++)