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

Only load second pass shaders when render-to-texture is set.

Browse Source
This commit is contained in:
Themaister 2011-09-26 22:45:28 +02:00
parent 8d4620b680
commit d01a4fe61b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/shader_cg.c
View File

@ -288,8 +288,6 @@ void gl_cg_deinit(void)
static bool load_plain(const char *path) static bool load_plain(const char *path)
{ {
SSNES_LOG("Loading Cg file: %s\n", 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}; char *listing[3] = {NULL};
const char *list = NULL; const char *list = NULL;
@ -308,8 +306,9 @@ static bool load_plain(const char *path)
if (list) if (list)
listing[1] = strdup(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].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); prg[2].vprg = cgCreateProgramFromFile(cgCtx, CG_SOURCE, g_settings.video.second_pass_shader, cgVProf, "main_vertex", 0);

2
gfx/shader_glsl.c
View File

@ -900,7 +900,7 @@ bool gl_glsl_init(const char *path)
return false; return false;
// SSNES custom two-pass with two different files. // 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); unsigned secondary_progs = get_xml_shaders(g_settings.video.second_pass_shader, progs, 1);
if (secondary_progs == 1) if (secondary_progs == 1)