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

Merge pull request #1411 from ssakash/PCRTC 

Merge Circuit: Improve offset detection of output circuit
This commit is contained in:
Gregory Hainaut 2016-06-19 13:45:51 +02:00 committed by GitHub
parent 41c522104e 4a0656e903
commit 36e82abd12
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/GSdx/GSRenderer.cpp
View File

@ -222,13 +222,18 @@ bool GSRenderer::Merge(int field)
src_hw[i] = (GSVector4(r) + GSVector4 (0, y_offset[i], 0, y_offset[i])) * scale / GSVector4(tex[i]->GetSize()).xyxy();
GSVector2 off(0, 0);
GSVector2i diff(dr[i].left - baseline.x, dr[i].top - baseline.y);
// Time Crisis 2/3 uses two side by side images when in split screen mode.
off.x = tex[i]->GetScale().x * (dr[i].left - baseline.x);
if(dr[i].top - baseline.y >= 4) // 2?
// Though ignore cases where baseline and display rectangle offsets only differ by 1 pixel, causes blurring and wrong resolution output on FFXII
if(diff.x >= 2)
{
off.y = tex[i]->GetScale().y * (dr[i].top - baseline.y);
off.x = tex[i]->GetScale().x * diff.x;
}
if(diff.y >= 4) // Shouldn't this be 2?
{
off.y = tex[i]->GetScale().y * diff.y;
if(m_regs->SMODE2.INT && m_regs->SMODE2.FFMD)
{