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

Remove references to XML shaders.

This commit is contained in:
Themaister 2014-05-25 23:40:14 +02:00
parent ea5fb7b711
commit c7eee695ce
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
command.c
View File

@ -24,6 +24,7 @@
#include "general.h" #include "general.h"
#include "compat/strl.h" #include "compat/strl.h"
#include "compat/posix_string.h" #include "compat/posix_string.h"
#include "file_path.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -213,15 +214,12 @@ static bool cmd_set_shader(const char *arg)
return false; return false;
enum rarch_shader_type type = RARCH_SHADER_NONE; enum rarch_shader_type type = RARCH_SHADER_NONE;
const char *ext = strrchr(arg, '.'); const char *ext = path_get_extension(arg);
if (ext) if (strcmp(ext, "glsl") == 0 || strcmp(ext, "glslp") == 0)
{ type = RARCH_SHADER_GLSL;
if (strcmp(ext, ".shader") == 0) else if (strcmp(ext, "cg") == 0 || strcmp(ext, "cgp") == 0)
type = RARCH_SHADER_GLSL; type = RARCH_SHADER_CG;
else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
type = RARCH_SHADER_CG;
}
if (type == RARCH_SHADER_NONE) if (type == RARCH_SHADER_NONE)
return false; return false;

2
driver.c
View File

@ -1319,7 +1319,7 @@ static void init_shader_dir(void)
if (!*g_settings.video.shader_dir) if (!*g_settings.video.shader_dir)
return; return;
g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir, "shader|cg|cgp|glsl|glslp", false); g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir, "cg|cgp|glsl|glslp", false);
if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0) if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
{ {
deinit_shader_dir(); deinit_shader_dir();

2
gfx/shader_parse.c
View File

@ -605,7 +605,7 @@ enum rarch_shader_type gfx_shader_parse_type(const char *path, enum rarch_shader
if (strcmp(ext, "cg") == 0 || strcmp(ext, "cgp") == 0) if (strcmp(ext, "cg") == 0 || strcmp(ext, "cgp") == 0)
return RARCH_SHADER_CG; return RARCH_SHADER_CG;
else if (strcmp(ext, "shader") == 0 || strcmp(ext, "glslp") == 0 || strcmp(ext, "glsl") == 0) else if (strcmp(ext, "glslp") == 0 || strcmp(ext, "glsl") == 0)
return RARCH_SHADER_GLSL; return RARCH_SHADER_GLSL;
return fallback; return fallback;

13
retroarch.c
View File

@ -2358,14 +2358,11 @@ static void check_shader_dir(void)
const char *shader = g_extern.shader_dir.list->elems[g_extern.shader_dir.ptr].data; const char *shader = g_extern.shader_dir.list->elems[g_extern.shader_dir.ptr].data;
enum rarch_shader_type type = RARCH_SHADER_NONE; enum rarch_shader_type type = RARCH_SHADER_NONE;
const char *ext = strrchr(shader, '.'); const char *ext = path_get_extension(shader);
if (ext) if (strcmp(ext, "glsl") == 0 || strcmp(ext, "glslp") == 0)
{ type = RARCH_SHADER_GLSL;
if (strcmp(ext, ".shader") == 0) else if (strcmp(ext, "cg") == 0 || strcmp(ext, "cgp") == 0)
type = RARCH_SHADER_GLSL; type = RARCH_SHADER_CG;
else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
type = RARCH_SHADER_CG;
}
if (type == RARCH_SHADER_NONE) if (type == RARCH_SHADER_NONE)
return; return;