From 3b392dfcd6a394c47a62d77a1aa31e6ffd2299fe Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 2 Apr 2013 22:40:26 +0200 Subject: [PATCH] Rename bsnes_shader_path to xml_shader_path. --- general.h | 2 +- gfx/gl.c | 12 ++++++------ retroarch.cfg | 2 +- settings.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/general.h b/general.h index 7abd504ae1..ba9a92d6ff 100644 --- a/general.h +++ b/general.h @@ -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; diff --git a/gfx/gl.c b/gfx/gl.c index 728780df19..0156bd4203 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -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 diff --git a/retroarch.cfg b/retroarch.cfg index 01ad064e8c..9810367ae9 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -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 diff --git a/settings.c b/settings.c index fbcc419354..24b394ec5f 100644 --- a/settings.c +++ b/settings.c @@ -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");