ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx ogl: avoid special format on the merge sprite hack

This commit is contained in:
Gregory Hainaut 2016-05-13 18:27:39 +02:00
parent b57b97eb3c
commit 24a673c482
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSRendererOGL.cpp
View File

@ -752,8 +752,8 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
} }
// Post-processing hack // Post-processing hack
if (UserHacks_merge_sprite) { if (UserHacks_merge_sprite && tex && tex->m_target && (m_vt.m_primclass == GS_SPRITE_CLASS)) {
if (!m_channel_shuffle && (m_vt.m_primclass == GS_SPRITE_CLASS) && tex && tex->m_target && PRIM->FST && ((m_vt.m_eq.value & 0xCFFFF) == 0xCFFFF)) { if (PRIM->FST && GSLocalMemory::m_psm[tex->m_TEX0.PSM].fmt < 2 && ((m_vt.m_eq.value & 0xCFFFF) == 0xCFFFF)) {
#ifdef ENABLE_OGL_DEBUG #ifdef ENABLE_OGL_DEBUG
const GSVector4 delta_p = m_vt.m_max.p - m_vt.m_min.p; const GSVector4 delta_p = m_vt.m_max.p - m_vt.m_min.p;
const GSVector4 delta_t = m_vt.m_max.t - m_vt.m_min.t; const GSVector4 delta_t = m_vt.m_max.t - m_vt.m_min.t;