From d8498d0de7b82a0882a6db7be1c18b7833e2d02c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 25 Feb 2018 23:49:00 +0100 Subject: [PATCH] Cleanups --- gfx/video_shader_parse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 54efcc8448..5ec3d34eb6 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -497,11 +497,13 @@ bool video_shader_resolve_parameters(config_file_t *conf, continue; #if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS) - /* First try to use the more robust slang implementation to support #includes. */ - /* FIXME: The check for slang can be removed if it's sufficiently tested for + /* First try to use the more robust slang + * implementation to support #includes. */ + /* FIXME: The check for slang can be removed + * if it's sufficiently tested for * GLSL/Cg as well, it should be the same implementation. */ if (string_is_equal(path_get_extension(path), "slang") && - slang_preprocess_parse_parameters(shader->pass[i].source.path, shader)) + slang_preprocess_parse_parameters(path, shader)) continue; /* If that doesn't work, fallback to the old path. @@ -522,7 +524,7 @@ bool video_shader_resolve_parameters(config_file_t *conf, { int ret = sscanf(line, "#pragma parameter %63s \"%63[^\"]\" %f %f %f %f", - param->id, param->desc, ¶m->initial, + param->id, param->desc, ¶m->initial, ¶m->minimum, ¶m->maximum, ¶m->step); if (ret < 5) @@ -535,7 +537,7 @@ bool video_shader_resolve_parameters(config_file_t *conf, param->step = 0.1f * (param->maximum - param->minimum); RARCH_LOG("Found #pragma parameter %s (%s) %f %f %f %f\n", - param->desc, param->id, param->initial, + param->desc, param->id, param->initial, param->minimum, param->maximum, param->step); param->current = param->initial;