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

Clean this up

This commit is contained in:
twinaphex 2017-10-22 05:24:57 +02:00
parent d203e4dc9c
commit 8072dab6fe
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/video_shader_parse.c
View File

@ -525,21 +525,27 @@ bool video_shader_resolve_parameters(config_file_t *conf,
char *line = (char*)malloc(4096 * sizeof(char)); char *line = (char*)malloc(4096 * sizeof(char));
const char *path = shader->pass[i].source.path; const char *path = shader->pass[i].source.path;
if (string_is_empty(path))
{
free(line);
continue;
}
#ifdef HAVE_SLANG #ifdef HAVE_SLANG
/* First try to use the more robust slang implementation to support #includes. */ /* 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 /* 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_empty(path) && (string_is_equal_fast(path_get_extension(path), "slang", 5)) && if (string_is_equal_fast(path_get_extension(path), "slang", 5) &&
slang_preprocess_parse_parameters(shader->pass[i].source.path, shader)) slang_preprocess_parse_parameters(shader->pass[i].source.path, shader))
{ {
free(line); free(line);
continue; continue;
} }
/* If that doesn't work, fallback to the old path. /* If that doesn't work, fallback to the old path.
* Ideally, we'd get rid of this path sooner or later. */ * Ideally, we'd get rid of this path sooner or later. */
#endif #endif
if (!string_is_empty(path)) file = filestream_open(path, RFILE_MODE_READ_TEXT, -1);
file = filestream_open(path, RFILE_MODE_READ_TEXT, -1);
if (!file) if (!file)
{ {