CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-26 13:25:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Shader) Fix regression - when a game was loaded with a core

Browse Source 
preset, it would load the preset inside shader slot 1 (menu)
instead of properly setting each pass
This commit is contained in:
twinaphex 2019-04-30 19:26:36 +02:00
parent 6683be9c44
commit 662976608a
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
menu/menu_shader.c
View File

@ -58,10 +58,11 @@ void menu_shader_manager_free(void)
**/ **/
bool menu_shader_manager_init(void) bool menu_shader_manager_init(void)
{ {
bool found = false;
bool is_preset = false; bool is_preset = false;
config_file_t *conf = NULL;
char *new_path = NULL; char *new_path = NULL;
const char *path_shader = retroarch_get_shader_preset(); const char *path_shader = retroarch_get_shader_preset();
enum rarch_shader_type type = RARCH_SHADER_NONE;
menu_shader_manager_free(); menu_shader_manager_free();
@ -71,17 +72,16 @@ bool menu_shader_manager_init(void)
if (!menu_driver_shader || !path_shader) if (!menu_driver_shader || !path_shader)
return false; return false;
type = video_shader_get_type_from_ext(path_get_extension(path_shader),
&is_preset);
if (is_preset) if (is_preset)
{ {
found = config_file_exists(path_shader); conf = config_file_new(path_shader);
new_path = strdup(path_shader); new_path = strdup(path_shader);
} }
else else
{ {
enum rarch_shader_type type = video_shader_get_type_from_ext(
path_get_extension(path_shader),
&is_preset);
if (video_shader_is_supported(type)) if (video_shader_is_supported(type))
{ {
strlcpy(menu_driver_shader->pass[0].source.path, path_shader, strlcpy(menu_driver_shader->pass[0].source.path, path_shader,
@ -91,8 +91,7 @@ bool menu_shader_manager_init(void)
else else
{ {
char preset_path[PATH_MAX_LENGTH]; char preset_path[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool found = false;
const char *shader_dir = const char *shader_dir =
*settings->paths.directory_video_shader ? *settings->paths.directory_video_shader ?
settings->paths.directory_video_shader : settings->paths.directory_video_shader :
@ -102,38 +101,39 @@ bool menu_shader_manager_init(void)
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.glslp", sizeof(preset_path)); "menu.glslp", sizeof(preset_path));
conf = config_file_new(preset_path);
found = config_file_exists(preset_path); if (!conf)
if (!found)
{ {
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.cgp", sizeof(preset_path)); "menu.cgp", sizeof(preset_path));
found = config_file_new(preset_path); conf = config_file_new(preset_path);
} }
if (!found) if (!conf)
{ {
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.slangp", sizeof(preset_path)); "menu.slangp", sizeof(preset_path));
found = config_file_new(preset_path); conf = config_file_new(preset_path);
} }
new_path = strdup(preset_path); new_path = strdup(preset_path);
} }
} }
if (!string_is_empty(new_path) && found) if (
!string_is_empty(new_path) && conf &&
video_shader_read_conf_cgp(conf, menu_driver_shader)
)
{ {
config_file_t *conf = config_file_new(new_path);
video_shader_read_conf_cgp(conf, menu_driver_shader);
video_shader_resolve_relative(menu_driver_shader, new_path); video_shader_resolve_relative(menu_driver_shader, new_path);
video_shader_resolve_parameters(conf, menu_driver_shader); video_shader_resolve_parameters(conf, menu_driver_shader);
config_file_free(conf);
} }
if (new_path) if (new_path)
free(new_path); free(new_path);
if (conf)
config_file_free(conf);
return true; return true;
} }