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

Cleanups

This commit is contained in:
twinaphex 2018-02-25 23:49:00 +01:00
parent 8dbe653e9f
commit d8498d0de7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/video_shader_parse.c
View File

@ -497,11 +497,13 @@ bool video_shader_resolve_parameters(config_file_t *conf,
continue; continue;
#if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS) #if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS)
/* First try to use the more robust slang implementation to support #includes. */ /* First try to use the more robust slang
/* FIXME: The check for slang can be removed if it's sufficiently tested for * 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. */ * GLSL/Cg as well, it should be the same implementation. */
if (string_is_equal(path_get_extension(path), "slang") && 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; continue;
/* If that doesn't work, fallback to the old path. /* 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, int ret = sscanf(line,
"#pragma parameter %63s \"%63[^\"]\" %f %f %f %f", "#pragma parameter %63s \"%63[^\"]\" %f %f %f %f",
param->id, param->desc, &param->initial, param->id, param->desc, &param->initial,
&param->minimum, &param->maximum, &param->step); &param->minimum, &param->maximum, &param->step);
if (ret < 5) if (ret < 5)
@ -535,7 +537,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
param->step = 0.1f * (param->maximum - param->minimum); param->step = 0.1f * (param->maximum - param->minimum);
RARCH_LOG("Found #pragma parameter %s (%s) %f %f %f %f\n", 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->minimum, param->maximum, param->step);
param->current = param->initial; param->current = param->initial;