From 57394a03e08dc32d3919623b286a05a092ffeae1 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 18 Jul 2015 13:29:34 +0200 Subject: [PATCH] partially revert: glsl: disable computing of extra alpha coeff in SW blending It generates undefined data in screen. Maybe blending isn't switch off properly. I need to investigate it. --- plugins/GSdx/res/glsl/tfx_fs.glsl | 4 ---- plugins/GSdx/res/glsl_source.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/plugins/GSdx/res/glsl/tfx_fs.glsl b/plugins/GSdx/res/glsl/tfx_fs.glsl index 27f5065d0c..39d7b79b0b 100644 --- a/plugins/GSdx/res/glsl/tfx_fs.glsl +++ b/plugins/GSdx/res/glsl/tfx_fs.glsl @@ -41,9 +41,7 @@ in SHADER // Same buffer but 2 colors for dual source blending layout(location = 0, index = 0) out vec4 SV_Target0; -#if !SW_BLEND layout(location = 0, index = 1) out vec4 SV_Target1; -#endif #ifdef ENABLE_BINDLESS_TEX layout(bindless_sampler, location = 0) uniform sampler2D TextureSampler; @@ -608,9 +606,7 @@ void ps_main() ps_fbmask(c); SV_Target0 = c; -#if !SW_BLEND SV_Target1 = vec4(alpha_blend); -#endif } #endif diff --git a/plugins/GSdx/res/glsl_source.h b/plugins/GSdx/res/glsl_source.h index b6b220dd09..036fc387d0 100644 --- a/plugins/GSdx/res/glsl_source.h +++ b/plugins/GSdx/res/glsl_source.h @@ -904,9 +904,7 @@ static const char* tfx_fs_all_glsl = "\n" "// Same buffer but 2 colors for dual source blending\n" "layout(location = 0, index = 0) out vec4 SV_Target0;\n" - "#if !SW_BLEND\n" "layout(location = 0, index = 1) out vec4 SV_Target1;\n" - "#endif\n" "\n" "#ifdef ENABLE_BINDLESS_TEX\n" "layout(bindless_sampler, location = 0) uniform sampler2D TextureSampler;\n" @@ -1471,9 +1469,7 @@ static const char* tfx_fs_all_glsl = " ps_fbmask(c);\n" "\n" " SV_Target0 = c;\n" - "#if !SW_BLEND\n" " SV_Target1 = vec4(alpha_blend);\n" - "#endif\n" "}\n" "\n" "#endif\n"