mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4023 from fr500/master

Browse Source 
override saving & config load improvements
This commit is contained in:
Twinaphex 2016-11-21 05:55:02 +01:00 committed by GitHub
commit 90accecfa9
2 changed files with 64 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
configuration.c
View File

@ -1627,6 +1627,28 @@ static void config_read_keybinds_conf(config_file_t *conf)
read_keybinds_user(conf, i); read_keybinds_user(conf, i);
} }
static bool check_shader_compatibility(enum file_path_enum enum_idx)
{
settings_t *settings = config_get_ptr();
if (string_is_equal("vulkan", settings->video.driver))
{
if (enum_idx != FILE_PATH_SLANGP_EXTENSION)
return false;
return true;
}
if (string_is_equal("gl", settings->video.driver) ||
string_is_equal("d3d9", settings->video.driver))
{
if (enum_idx == FILE_PATH_SLANGP_EXTENSION)
return false;
return true;
}
return false;
}
#if 0 #if 0
static bool config_read_keybinds(const char *path) static bool config_read_keybinds(const char *path)
{ {
@ -2150,6 +2172,19 @@ static bool config_load_file(const char *path, bool set_defaults,
config_read_keybinds_conf(conf); config_read_keybinds_conf(conf);
ret = true; ret = true;
for(i = FILE_PATH_CGP_EXTENSION; i <= FILE_PATH_SLANGP_EXTENSION; i++)
{
if(strstr(file_path_str((enum file_path_enum)(i)), path_get_extension(settings->path.shader)))
{
if (!check_shader_compatibility(i))
{
RARCH_LOG("Incompatible shader for backend %s, clearing...\n", settings->video.driver);
settings->path.shader[0] = '\0';
break;
}
}
}
end: end:
if (conf) if (conf)
@ -2434,28 +2469,6 @@ bool config_load_remap(void)
return false; return false;
} }
static bool check_shader_compatibility(enum file_path_enum enum_idx)
{
settings_t *settings = config_get_ptr();
if (string_is_equal("vulkan", settings->video.driver))
{
if (enum_idx != FILE_PATH_SLANGP_EXTENSION)
return false;
return true;
}
if (string_is_equal("gl", settings->video.driver) ||
string_is_equal("d3d9", settings->video.driver))
{
if (enum_idx == FILE_PATH_SLANGP_EXTENSION)
return false;
return true;
}
return false;
}
/** /**
* config_load_shader_preset: * config_load_shader_preset:
* *
@ -2502,7 +2515,7 @@ bool config_load_shader_preset(void)
RARCH_LOG("Shaders: preset directory: %s\n", shader_directory); RARCH_LOG("Shaders: preset directory: %s\n", shader_directory);
for(idx = FILE_PATH_CGP_EXTENSION; idx < FILE_PATH_SLANGP_EXTENSION; idx++) for(idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++)
{ {
config_file_t *new_conf = NULL; config_file_t *new_conf = NULL;
@ -2539,7 +2552,7 @@ bool config_load_shader_preset(void)
return true; return true;
} }
for(idx = FILE_PATH_CGP_EXTENSION; idx < FILE_PATH_SLANGP_EXTENSION; idx++) for(idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++)
{ {
config_file_t *new_conf = NULL; config_file_t *new_conf = NULL;
@ -3200,6 +3213,33 @@ bool config_save_overrides(int override_type)
} }
} }
for (i = 0; i < MAX_USERS; i++)
{
char cfg[64];
cfg[0] = '\0';
if (settings->input.device[i] != overrides->input.device[i])
{
snprintf(cfg, sizeof(cfg), "input_device_p%u", i + 1);
config_set_int(conf, cfg, overrides->input.device[i]);
}
if (settings->input.joypad_map[i] != overrides->input.joypad_map[i])
{
snprintf(cfg, sizeof(cfg), "input_player%u_joypad_index", i + 1);
config_set_int(conf, cfg, overrides->input.joypad_map[i]);
}
if (settings->input.libretro_device[i] != overrides->input.libretro_device[i])
{
snprintf(cfg, sizeof(cfg), "input_libretro_device_p%u", i + 1);
config_set_int(conf, cfg, overrides->input.libretro_device[i]);
}
if (settings->input.analog_dpad_mode[i] != overrides->input.analog_dpad_mode[i])
{
snprintf(cfg, sizeof(cfg), "input_player%u_analog_dpad_mode", i + 1);
config_set_int(conf, cfg, overrides->input.analog_dpad_mode[i]);
}
}
ret = false; ret = false;
switch (override_type) switch (override_type)

18
input/input_remapping.c
View File

@ -82,18 +82,6 @@ bool input_remapping_load_file(void *data, const char *path)
settings->input.remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = settings->input.remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] =
key_remap; key_remap;
} }
snprintf(buf, sizeof(buf), "input_player%u_joypad_index", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.joypad_map[i], buf);
snprintf(buf, sizeof(buf), "input_player%u_analog_dpad_mode", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.analog_dpad_mode[i], buf);
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DEVICE, &i))
{
snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.libretro_device[i], buf);
}
} }
config_file_free(conf); config_file_free(conf);
@ -165,12 +153,6 @@ bool input_remapping_save_file(const char *path)
config_unset(conf,key_ident[j]); config_unset(conf,key_ident[j]);
} }
} }
snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1);
config_set_int(conf, buf, settings->input.libretro_device[i]);
snprintf(buf, sizeof(buf), "input_player%u_analog_dpad_mode", i + 1);
config_set_int(conf, buf, settings->input.analog_dpad_mode[i]);
} }
ret = config_file_write(conf, remap_file); ret = config_file_write(conf, remap_file);