Cleanups
This commit is contained in:
parent
182ee094c7
commit
8345ad2aba
|
@ -49,17 +49,15 @@
|
||||||
struct string_list *dir_list_new_special(const char *input_dir,
|
struct string_list *dir_list_new_special(const char *input_dir,
|
||||||
enum dir_list_type type, const char *filter)
|
enum dir_list_type type, const char *filter)
|
||||||
{
|
{
|
||||||
char ext_shaders[PATH_MAX_LENGTH];
|
char ext_shaders[PATH_MAX_LENGTH] = {0};
|
||||||
char ext_name[PATH_MAX_LENGTH];
|
char ext_name[PATH_MAX_LENGTH] = {0};
|
||||||
const char *dir = NULL;
|
const char *dir = NULL;
|
||||||
const char *exts = NULL;
|
const char *exts = NULL;
|
||||||
bool include_dirs = false;
|
bool include_dirs = false;
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
settings_t *settings = config_get_ptr();
|
|
||||||
|
|
||||||
(void)input_dir;
|
(void)input_dir;
|
||||||
(void)settings;
|
(void)settings;
|
||||||
ext_shaders[0] = '\0';
|
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
|
@ -92,7 +90,7 @@ struct string_list *dir_list_new_special(const char *input_dir,
|
||||||
if (!str_list)
|
if (!str_list)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dir = settings->directory.video_shader;
|
dir = input_dir;
|
||||||
#ifdef HAVE_CG
|
#ifdef HAVE_CG
|
||||||
string_list_append(str_list, "cg", attr);
|
string_list_append(str_list, "cg", attr);
|
||||||
string_list_append(str_list, "cgp", attr);
|
string_list_append(str_list, "cgp", attr);
|
||||||
|
|
|
@ -472,7 +472,7 @@ static bool shader_dir_init(rarch_dir_list_t *dir_list)
|
||||||
if (!*settings->directory.video_shader)
|
if (!*settings->directory.video_shader)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
dir_list->list = dir_list_new_special(NULL, DIR_LIST_SHADERS, NULL);
|
dir_list->list = dir_list_new_special(settings->directory.video_shader, DIR_LIST_SHADERS, NULL);
|
||||||
|
|
||||||
if (!dir_list->list || dir_list->list->size == 0)
|
if (!dir_list->list || dir_list->list->size == 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue