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

Merge branch 'master' of github.com:PCSX2/pcsx2

This commit is contained in:
Gregory Hainaut 2015-12-02 19:10:06 +01:00
parent fb1a19f157 4c765a04f7
commit e01c1784f3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/GSdx/GSState.cpp
View File

@ -369,10 +369,10 @@ GSVector4i GSState::GetDisplayRect(int i)
} }
// There's a problem when games expand/shrink and relocate the visible area since GSdx doesn't support // There's a problem when games expand/shrink and relocate the visible area since GSdx doesn't support
// moving the output area. (Disgaea 2 intro FMV when upscaling is used, also those games hackfixed below.) // moving the output area. (Disgaea 2 intro FMV when upscaling is used).
GSVector4i GSState::GetFrameRect(int i) GSVector4i GSState::GetFrameRect(int i)
{ {
if(i < 0) i = IsEnabled(1) ? 1 : 0; if (i < 0) i = IsEnabled(1) ? 1 : 0;
GSVector4i r = GetDisplayRect(i); GSVector4i r = GetDisplayRect(i);
@ -384,9 +384,9 @@ GSVector4i GSState::GetFrameRect(int i)
h = 448; h = 448;
} }
if(m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1) h >>= 1; if (m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1) h >>= 1;
//Breaks Disgaea2 FMV borders //watch Disgaea2 FMV borders when changing
r.left = m_regs->DISP[i].DISPFB.DBX; r.left = m_regs->DISP[i].DISPFB.DBX;
r.top = m_regs->DISP[i].DISPFB.DBY; r.top = m_regs->DISP[i].DISPFB.DBY;
r.right = r.left + w; r.right = r.left + w;