From 1c87c26e725ebf8424b621ed0b0d1146056d9835 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 6 Apr 2013 03:55:07 +0200 Subject: [PATCH] Revert "(HLSL Xbox 360) Take out second_pass_shader/fbo" This reverts commit 5172168143eb78464cee5a7dc1a1a81bc673dabd. --- gfx/shader_hlsl.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gfx/shader_hlsl.c b/gfx/shader_hlsl.c index edde6a01c5..875a41c0ce 100644 --- a/gfx/shader_hlsl.c +++ b/gfx/shader_hlsl.c @@ -264,8 +264,21 @@ static bool load_plain(const char *path) prg[1] = prg[0]; } - prg[2] = prg[0]; - hlsl_shader_num = 1; + if (*g_settings.video.second_pass_shader && g_settings.video.render_to_texture) + { + if (!load_program(2, g_settings.video.second_pass_shader, true)) + { + RARCH_ERR("Failed to load HLSL shader %s into secondpass.\n", path); + prg[2] = prg[0]; + } + + hlsl_shader_num = 2; + } + else + { + prg[2] = prg[0]; + hlsl_shader_num = 1; + } return true; } @@ -354,4 +367,4 @@ void hlsl_deinit(void) return; hlsl_deinit_state(); -} +} \ No newline at end of file