mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9195 from LazyBumHorse/shader_paths

Browse Source 
Simplify glslang_read_shader_file() a bit
This commit is contained in:
Twinaphex 2019-07-25 17:04:32 +02:00 committed by GitHub
commit 1bee2b70ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/drivers_shader/glslang_util.cpp
View File

@ -47,26 +47,15 @@ bool glslang_read_shader_file(const char *path, vector<string> *output, bool roo
char *buf = nullptr;
int64_t len = 0;
const char *basename = path_basename(path);
size_t path_size = PATH_MAX_LENGTH * sizeof(char);
char *tmp_path = (char*)malloc(path_size);
include_path[0] = tmp[0] = '\0';
strlcpy(tmp_path, path, path_size);
path_resolve_realpath(tmp_path, path_size, false);
if (!path_is_valid(tmp_path))
strlcpy(tmp_path, path, path_size);
if (!filestream_read_file(tmp_path, (void**)&buf, &len))
if (!filestream_read_file(path, (void**)&buf, &len))
{
RARCH_ERR("Failed to open shader file: \"%s\".\n", tmp_path);
free(tmp_path);
RARCH_ERR("Failed to open shader file: \"%s\".\n", path);
return false;
}
free(tmp_path);
/* Remove Windows \r chars if we encounter them.
* filestream_read_file() allocates one extra for 0 terminator. */
auto itr = remove_if(buf, buf + len + 1, [](char c) {