This commit is contained in:
twinaphex 2019-08-08 14:57:28 +02:00
parent 211e664e5d
commit 83c113cb59

View File

@ -536,7 +536,8 @@ bool video_shader_resolve_parameters(config_file_t *conf,
line_index++;
/* Check if this is a '#pragma parameter' line */
if (strncmp("#pragma parameter", line, STRLEN_CONST("#pragma parameter")))
if (strncmp("#pragma parameter", line,
STRLEN_CONST("#pragma parameter")))
continue;
/* Parse line */
@ -567,10 +568,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
string_list_free(lines);
}
if (conf && !video_shader_resolve_current_parameters(conf, shader))
return false;
return true;
return video_shader_resolve_current_parameters(conf, shader);
}
/**
@ -593,8 +591,6 @@ bool video_shader_read_conf_preset(config_file_t *conf,
struct string_list *file_list = NULL;
bool watch_files = settings->bools.video_shader_watch_files;
(void)file_list;
memset(shader, 0, sizeof(*shader));
if (!config_get_uint(conf, "shaders", &shaders))