ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve shader initialization code. 

Patch by @jdgleaver.
This commit is contained in:
Joan Coll Cerdán 2020-05-21 13:28:17 +02:00
parent e43111d9cb
commit 04016ed4a6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroarch.c
View File

@ -2452,8 +2452,10 @@ struct string_list *dir_list_new_special(const char *input_dir,
string_list_free(str_list); string_list_free(str_list);
exts = ext_shaders; exts = ext_shaders;
} }
#endif
break; break;
#else
return NULL;
#endif
case DIR_LIST_COLLECTIONS: case DIR_LIST_COLLECTIONS:
exts = "lpl"; exts = "lpl";
break; break;
@ -21668,6 +21670,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
dir_free_shader(); dir_free_shader();
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
if (!string_is_empty(settings->paths.directory_video_shader)) if (!string_is_empty(settings->paths.directory_video_shader))
dir_list_is_free = !dir_init_shader( dir_list_is_free = !dir_init_shader(
settings->paths.directory_video_shader, settings->paths.directory_video_shader,
@ -21680,18 +21683,18 @@ static bool video_driver_init_internal(bool *video_is_threaded)
if (dir_list_is_free && !path_is_empty(RARCH_PATH_CONFIG)) if (dir_list_is_free && !path_is_empty(RARCH_PATH_CONFIG))
{ {
config_file_directory = (char*)malloc(PATH_MAX_LENGTH); config_file_directory = strdup(path_get(RARCH_PATH_CONFIG));
path_basedir(config_file_directory);
fill_pathname_basedir(config_file_directory,
path_get(RARCH_PATH_CONFIG), PATH_MAX_LENGTH);
if (config_file_directory) if (config_file_directory)
{ {
dir_list_is_free = !dir_init_shader( dir_list_is_free = !dir_init_shader(
config_file_directory, config_file_directory,
settings->bools.show_hidden_files); settings->bools.show_hidden_files);
free(config_file_directory);
} }
} }
#endif
return true; return true;