From d01a4fe61b69e1e3649d1165f5b280800e1d5e2e Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 26 Sep 2011 22:45:28 +0200 Subject: [PATCH] Only load second pass shaders when render-to-texture is set. --- gfx/shader_cg.c | 5 ++--- gfx/shader_glsl.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c index 2a3a716ce6..188f91e811 100644 --- a/gfx/shader_cg.c +++ b/gfx/shader_cg.c @@ -288,8 +288,6 @@ void gl_cg_deinit(void) static bool load_plain(const char *path) { SSNES_LOG("Loading Cg file: %s\n", path); - if (strlen(g_settings.video.second_pass_shader) > 0) - SSNES_LOG("Loading 2nd pass: %s\n", g_settings.video.second_pass_shader); char *listing[3] = {NULL}; const char *list = NULL; @@ -308,8 +306,9 @@ static bool load_plain(const char *path) if (list) listing[1] = strdup(list); - if (strlen(g_settings.video.second_pass_shader) > 0) + if (*g_settings.video.second_pass_shader && g_settings.video.render_to_texture) { + SSNES_LOG("Loading 2nd pass: %s\n", g_settings.video.second_pass_shader); prg[2].fprg = cgCreateProgramFromFile(cgCtx, CG_SOURCE, g_settings.video.second_pass_shader, cgFProf, "main_fragment", 0); prg[2].vprg = cgCreateProgramFromFile(cgCtx, CG_SOURCE, g_settings.video.second_pass_shader, cgVProf, "main_vertex", 0); diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index ccaed4120d..766ebf7511 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -900,7 +900,7 @@ bool gl_glsl_init(const char *path) return false; // SSNES custom two-pass with two different files. - if (num_progs == 1 && *g_settings.video.second_pass_shader) + if (num_progs == 1 && *g_settings.video.second_pass_shader && g_settings.video.render_to_texture) { unsigned secondary_progs = get_xml_shaders(g_settings.video.second_pass_shader, progs, 1); if (secondary_progs == 1)