CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-13 22:08:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename bsnes_shader_path to xml_shader_path.

Browse Source
This commit is contained in:
Themaister 2013-04-02 22:40:26 +02:00
parent 52d6c0158f
commit 3b392dfcd6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.h
View File

@ -178,7 +178,7 @@ struct settings
bool scale_integer;
unsigned aspect_ratio_idx;
char cg_shader_path[PATH_MAX];
char bsnes_shader_path[PATH_MAX];
char xml_shader_path[PATH_MAX];
char filter_path[PATH_MAX];
enum rarch_shader_type shader_type;
float refresh_rate;

12
gfx/gl.c
View File

@ -251,8 +251,8 @@ 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_GLSL)
&& *g_settings.video.bsnes_shader_path)
shader_path = g_settings.video.bsnes_shader_path;
&& *g_settings.video.xml_shader_path)
shader_path = g_settings.video.xml_shader_path;
gl->shader = &gl_glsl_backend;
return gl->shader->init(shader_path);
@ -268,7 +268,7 @@ static bool gl_shader_init(void *data)
{
case RARCH_SHADER_AUTO:
{
if (*g_settings.video.cg_shader_path && *g_settings.video.bsnes_shader_path)
if (*g_settings.video.cg_shader_path && *g_settings.video.xml_shader_path)
RARCH_WARN("Both Cg and GLSL XML shader are defined in config file. Cg shader will be selected by default.\n");
#ifdef HAVE_CG
@ -280,10 +280,10 @@ static bool gl_shader_init(void *data)
#endif
#ifdef HAVE_GLSL
if (*g_settings.video.bsnes_shader_path)
if (*g_settings.video.xml_shader_path)
{
backend = &gl_glsl_backend;
shader_path = g_settings.video.bsnes_shader_path;
shader_path = g_settings.video.xml_shader_path;
}
#endif
break;
@ -299,7 +299,7 @@ static bool gl_shader_init(void *data)
#ifdef HAVE_GLSL
case RARCH_SHADER_GLSL:
backend = &gl_glsl_backend;
shader_path = g_settings.video.bsnes_shader_path;
shader_path = g_settings.video.xml_shader_path;
break;
#endif

2
retroarch.cfg
View File

@ -106,7 +106,7 @@
# Path to GLSL XML shader. If both Cg shader path and XML shader path are defined,
# Cg shader will take priority unless overridden in video_shader_type.
# video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"
# video_xml_shader = "/path/to/xml/shader.shader"
# Which shader type to use. Valid values are "cg", "bsnes", "none" and "auto"
# video_shader_type = auto

2
settings.c
View File

@ -454,7 +454,7 @@ bool config_load_file(const char *path)
CONFIG_GET_FLOAT(video.refresh_rate, "video_refresh_rate");
CONFIG_GET_PATH(video.cg_shader_path, "video_cg_shader");
CONFIG_GET_PATH(video.bsnes_shader_path, "video_bsnes_shader");
CONFIG_GET_PATH(video.xml_shader_path, "video_xml_shader");
CONFIG_GET_PATH(video.second_pass_shader, "video_second_pass_shader");
CONFIG_GET_BOOL(video.render_to_texture, "video_render_to_texture");
CONFIG_GET_FLOAT(video.fbo.scale_x, "video_fbo_scale_x");