From 83c113cb5909ab1c14cf47ffe58ace6163995ac1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 8 Aug 2019 14:57:28 +0200 Subject: [PATCH] Cleanups --- gfx/video_shader_parse.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index c788f3d5d9..7507f2a593 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -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))