From b4c7d32741ea6778eb9f414dc5bd4bbd03792e71 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 29 Apr 2016 23:59:42 +0200 Subject: [PATCH] gsdx ogl: avoid to wrongly detect a channel shuffle --- plugins/GSdx/GSRendererHW.cpp | 2 +- plugins/GSdx/GSRendererOGL.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/GSRendererHW.cpp index b8347f54c4..7318f05c5d 100644 --- a/plugins/GSdx/GSRendererHW.cpp +++ b/plugins/GSdx/GSRendererHW.cpp @@ -479,7 +479,7 @@ void GSRendererHW::Draw() // Texture shuffle is not yet supported with strange clamp mode ASSERT(!m_texture_shuffle || (context->CLAMP.WMS < 3 && context->CLAMP.WMT < 3)); - if (tex->m_target && m_context->TEX0.PSM == PSM_PSMT8 && single_page) { + if (tex->m_target && m_context->TEX0.PSM == PSM_PSMT8 && single_page && draw_sprite_tex) { GL_INS("Channel shuffle effect detected (2nd shot)"); m_channel_shuffle = true; } else { diff --git a/plugins/GSdx/GSRendererOGL.cpp b/plugins/GSdx/GSRendererOGL.cpp index 5f50e8b041..88be5650e5 100644 --- a/plugins/GSdx/GSRendererOGL.cpp +++ b/plugins/GSdx/GSRendererOGL.cpp @@ -775,6 +775,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour ps_sel.channel = 1; } else { GL_INS("channel not supported"); + m_channel_shuffle = false; ASSERT(0); } dev->PSSetShaderResource(4, tex->m_from_target);