From 2901e94ebcd9cfc03ff1f32cf3163dfe6c674913 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 25 Jul 2015 17:01:00 +0200 Subject: [PATCH] gsdx-ogl: always bind the RT as input texture To avoid code duplication --- plugins/GSdx/GSRendererOGL.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/GSdx/GSRendererOGL.cpp b/plugins/GSdx/GSRendererOGL.cpp index cb6c0ed881..98ecfda50a 100644 --- a/plugins/GSdx/GSRendererOGL.cpp +++ b/plugins/GSdx/GSRendererOGL.cpp @@ -562,8 +562,6 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour ps_sel.blend_c = om_bsel.c; ps_sel.blend_d = om_bsel.d; - dev->PSSetShaderResource(3, rt); - // Require the fix alpha vlaue if (ALPHA.C == 2) { ps_cb.AlphaCoeff.a = afix; @@ -590,7 +588,6 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour if (DATE_GL45) { gl_TextureBarrier(); - dev->PSSetShaderResource(3, rt); } else if (DATE) { GSVector4i dRect = ComputeBoundingBox(rtscale, rtsize); @@ -602,7 +599,6 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour // Create an r32ui image that will containt primitive ID if (DATE_GL42) { dev->InitPrimDateTexture(rt); - dev->PSSetShaderResource(3, rt); } else { GSVector4 src = GSVector4(dRect) / GSVector4(rtsize.x, rtsize.y).xyxy(); GSVector4 dst = src * 2.0f - 1.0f; @@ -846,6 +842,9 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour dev->PSSetShaderResource(1, NULL); #endif } + // Always bind the RT. This way special effect can use it. + dev->PSSetShaderResource(3, rt); + // GS