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

Merge pull request #1137 from PCSX2-Alpha/CRTC_Scaling 

PCRTC: Proper handling for 720P/1080P video modes.
This commit is contained in:
Gregory Hainaut 2016-02-01 10:11:58 +01:00
parent c20dc61f16 c889659ad7
commit 85f64b8c08
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GS.h
View File

@ -1284,3 +1284,7 @@ enum stateType {ST_WRITE, ST_TRANSFER, ST_VSYNC};
// default gs config settings // default gs config settings
#define DEFAULT_EXTRA_RENDERING_THREADS 2 #define DEFAULT_EXTRA_RENDERING_THREADS 2
// GS Video modes macros
#define Vmode_VESA (m_regs->SMODE1.CMOD == 0)
#define Vmode_NTSC (m_regs->SMODE1.CMOD == 2)
#define Vmode_PAL (m_regs->SMODE1.CMOD == 3)

1
plugins/GSdx/GSRenderer.cpp
View File

@ -218,7 +218,6 @@ bool GSRenderer::Merge(int field)
if(dr[i].height() > 512) // hmm if(dr[i].height() > 512) // hmm
{ {
int y = GetDeviceSize(i).y; int y = GetDeviceSize(i).y;
if(m_regs->SMODE2.INT && m_regs->SMODE2.FFMD) y /= 2;
r.bottom = r.top + y; r.bottom = r.top + y;
} }

20
plugins/GSdx/GSState.cpp
View File

@ -349,22 +349,24 @@ void GSState::ResetHandlers()
GSVector4i GSState::GetDisplayRect(int i) GSVector4i GSState::GetDisplayRect(int i)
{ {
if(i < 0) i = IsEnabled(1) ? 1 : 0; if(i < 0) i = IsEnabled(1) ? 1 : 0;
int height = m_regs->DISP[i].DISPLAY.DH + 1; int height = (m_regs->DISP[i].DISPLAY.DH + 1) / (m_regs->DISP[i].DISPLAY.MAGV + 1);
int width = m_regs->DISP[i].DISPLAY.DW + 1; int width = (m_regs->DISP[i].DISPLAY.DW + 1) / (m_regs->DISP[i].DISPLAY.MAGH + 1);
GSVector4i r; GSVector4i r;
//Some games (such as Pool Paradise) use alternate line reading and provide a massive height which is really half. //Some games (such as Pool Paradise) use alternate line reading and provide a massive height which is really half.
if (height > 640) if (height > 640 && !Vmode_VESA)
{ {
height /= 2; height /= 2;
} }
r.left = m_regs->DISP[i].DISPLAY.DX / (m_regs->DISP[i].DISPLAY.MAGH + 1); r.left = m_regs->DISP[i].DISPLAY.DX / (m_regs->DISP[i].DISPLAY.MAGH + 1);
r.top = m_regs->DISP[i].DISPLAY.DY / (m_regs->DISP[i].DISPLAY.MAGV + 1); r.top = m_regs->DISP[i].DISPLAY.DY / (m_regs->DISP[i].DISPLAY.MAGV + 1);
r.right = r.left + width / (m_regs->DISP[i].DISPLAY.MAGH + 1); r.right = r.left + width;
r.bottom = r.top + height / (m_regs->DISP[i].DISPLAY.MAGV + 1); r.bottom = r.top + height;
// Useful for debugging games:
//printf("DW: %d , DH: %d , left: %d , right: %d , top: %d , down: %d , MAGH: %d , MAGV: %d\n", m_regs->DISP[i].DISPLAY.DW, m_regs->DISP[i].DISPLAY.DH, r.left, r.right, r.top, r.bottom , m_regs->DISP[i].DISPLAY.MAGH,m_regs->DISP[i].DISPLAY.MAGV);
return r; return r;
} }
@ -383,7 +385,7 @@ GSVector4i GSState::GetFrameRect(int i)
// Some NTSC mode games request higher height values for accurate display size / position when width is 640 // Some NTSC mode games request higher height values for accurate display size / position when width is 640
// Testcases : PS logo (640x512) , Resident Evil:CVX (640x480). potentially more test cases... // Testcases : PS logo (640x512) , Resident Evil:CVX (640x480). potentially more test cases...
if (m_regs->SMODE1.CMOD == 2 && h > 448 && w < 640) if (Vmode_NTSC && h > 448 && w < 640)
h = 448; h = 448;
if (m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1) if (m_regs->SMODE2.INT && m_regs->SMODE2.FFMD && h > 1)
@ -468,7 +470,7 @@ float GSState::GetTvRefreshRate()
// TODO: Frequencies for VESA / DTV : http://users.neoscientists.org/~blue/ps2videomodes.txt // TODO: Frequencies for VESA / DTV : http://users.neoscientists.org/~blue/ps2videomodes.txt
// SMODE1 PLL Loop divider (LC) could be used for detection of other video modes. CMOD's only useful for NTSC/PAL.(2/3) // SMODE1 PLL Loop divider (LC) could be used for detection of other video modes. CMOD's only useful for NTSC/PAL.(2/3)
return (m_regs->SMODE1.CMOD & 1) ? 50 : (60/1.001f); return (Vmode_PAL) ? 50 : (60/1.001f);
} }
// GIFPackedRegHandler* // GIFPackedRegHandler*