From d77da6b53d1cdaf9db9112b5b60823040e1a0dbc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 21 Apr 2017 23:10:55 +0200
Subject: [PATCH] Fix bug in shader_glsl.c
---
gfx/drivers_shader/shader_glsl.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index f4c4a8a860..7930cc044c 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -758,15 +758,7 @@ static void *gl_glsl_init(void *data, const char *path)
bool ret = false;
const char *path_ext = path_get_extension(path);
- if (memcmp(path_ext, "glsl", 4) == 0)
- {
- strlcpy(glsl->shader->pass[0].source.path, path,
- sizeof(glsl->shader->pass[0].source.path));
- glsl->shader->passes = 1;
- glsl->shader->modern = true;
- ret = true;
- }
- else if (memcmp(path_ext, "glslp", 5) == 0)
+ if (memcmp(path_ext, "glslp", 5) == 0)
{
conf = config_file_new(path);
if (conf)
@@ -775,6 +767,14 @@ static void *gl_glsl_init(void *data, const char *path)
glsl->shader->modern = true;
}
}
+ else if (memcmp(path_ext, "glsl", 4) == 0)
+ {
+ strlcpy(glsl->shader->pass[0].source.path, path,
+ sizeof(glsl->shader->pass[0].source.path));
+ glsl->shader->passes = 1;
+ glsl->shader->modern = true;
+ ret = true;
+ }
if (!ret)
{