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

Rename RARCH_SHADER_BSNES to RARCH_SHADER_GLSL

Browse Source
This commit is contained in:
twinaphex 2013-01-07 17:03:10 +01:00
parent 3a5d056b95
commit b56b645366
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -214,7 +214,7 @@ static bool cmd_set_shader(const char *arg)
if (ext)
{
if (strcmp(ext, ".shader") == 0)
type = RARCH_SHADER_BSNES;
type = RARCH_SHADER_GLSL;
else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
type = RARCH_SHADER_CG;
}

2
console/rmenu/rmenu.c
View File

@ -618,7 +618,7 @@ void browser_render(void *data)
unsigned get_shader_type(void)
{
#if defined(HAVE_GLSL)
return RARCH_SHADER_BSNES;
return RARCH_SHADER_GLSL;
#elif defined(HAVE_CG)
return RARCH_SHADER_CG;
#elif defined(HAVE_HLSL)

2
driver.h
View File

@ -131,7 +131,7 @@ enum rarch_shader_type
{
RARCH_SHADER_CG,
RARCH_SHADER_HLSL,
RARCH_SHADER_BSNES,
RARCH_SHADER_GLSL,
RARCH_SHADER_AUTO,
RARCH_SHADER_NONE
};

6
gfx/gl.c
View File

@ -209,7 +209,7 @@ static bool gl_shader_init(void *data) // We always need a shader alive in GLES2
{
gl_t *gl = (gl_t*)data;
const char *shader_path = NULL;
if ((g_settings.video.shader_type == RARCH_SHADER_AUTO || g_settings.video.shader_type == RARCH_SHADER_BSNES)
if ((g_settings.video.shader_type == RARCH_SHADER_AUTO || g_settings.video.shader_type == RARCH_SHADER_GLSL)
&& *g_settings.video.bsnes_shader_path)
shader_path = g_settings.video.bsnes_shader_path;
@ -256,7 +256,7 @@ static bool gl_shader_init(void *data)
#endif
#ifdef HAVE_GLSL
case RARCH_SHADER_BSNES:
case RARCH_SHADER_GLSL:
backend = &gl_glsl_backend;
shader_path = g_settings.video.bsnes_shader_path;
break;
@ -1726,7 +1726,7 @@ static bool gl_set_shader(void *data, enum rarch_shader_type type, const char *p
switch (type)
{
#ifdef HAVE_GLSL
case RARCH_SHADER_BSNES:
case RARCH_SHADER_GLSL:
if (mask & (1ULL << RARCH_SHADER_MULTIPASS))
{
if (!gl_glsl_init(path))

2
retroarch.c
View File

@ -2327,7 +2327,7 @@ static void check_shader_dir(void)
if (ext)
{
if (strcmp(ext, ".shader") == 0)
type = RARCH_SHADER_BSNES;
type = RARCH_SHADER_GLSL;
else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
type = RARCH_SHADER_CG;
}

2
settings.c
View File

@ -419,7 +419,7 @@ bool config_load_file(const char *path)
if (strcmp("cg", tmp_str) == 0)
g_settings.video.shader_type = RARCH_SHADER_CG;
else if (strcmp("bsnes", tmp_str) == 0)
g_settings.video.shader_type = RARCH_SHADER_BSNES;
g_settings.video.shader_type = RARCH_SHADER_GLSL;
else if (strcmp("auto", tmp_str) == 0)
g_settings.video.shader_type = RARCH_SHADER_AUTO;
else if (strcmp("none", tmp_str) == 0)