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

Merge pull request #1504 from ssakash/RemoveFunction 

GSDX: Remove GetDeviceSize()
This commit is contained in:
Gregory Hainaut 2016-08-08 16:15:07 +02:00 committed by GitHub
parent 8e8b8f8ed5 bc24e90070
commit 0dcce91a6e
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/GSRendererSW.cpp
View File

@ -107,12 +107,10 @@ void GSRendererSW::VSync(int field)
GSVector4i dr = GetDisplayRect(); GSVector4i dr = GetDisplayRect();
GSVector4i fr = GetFrameRect(); GSVector4i fr = GetFrameRect();
GSVector2i ds = GetDeviceSize();
fprintf(s_fp, "dr %d %d %d %d, fr %d %d %d %d, ds %d %d\n", fprintf(s_fp, "dr %d %d %d %d, fr %d %d %d %d\n",
dr.x, dr.y, dr.z, dr.w, dr.x, dr.y, dr.z, dr.w,
fr.x, fr.y, fr.z, fr.w, fr.x, fr.y, fr.z, fr.w);
ds.x, ds.y);
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {

19
plugins/GSdx/GSState.cpp
View File

@ -449,25 +449,6 @@ GSVector4i GSState::GetFrameRect(int i)
return rectangle; return rectangle;
} }
GSVector2i GSState::GetDeviceSize(int i)
{
// TODO: return (m_regs->SMODE1.CMOD & 1) ? GSVector2i(640, 576) : GSVector2i(640, 480);
// TODO: other params of SMODE1 should affect the true device display size
// TODO2: pal games at 60Hz
if(i < 0) i = IsEnabled(1) ? 1 : 0;
GSVector4i rectangle = GetDisplayRect(i);
GSVector2i DeviceSize(rectangle.width(), rectangle.height());
if(isinterlaced() && m_regs->SMODE2.FFMD && DeviceSize.y > 1)
DeviceSize.y >>= 1;
return DeviceSize;
}
bool GSState::IsEnabled(int i) bool GSState::IsEnabled(int i)
{ {
ASSERT(i >= 0 && i < 2); ASSERT(i >= 0 && i < 2);

1
plugins/GSdx/GSState.h
View File

@ -239,7 +239,6 @@ public:
GSVector4i GetDisplayRect(int i = -1); GSVector4i GetDisplayRect(int i = -1);
GSVector4i GetFrameRect(int i = -1); GSVector4i GetFrameRect(int i = -1);
GSVector2i GetDeviceSize(int i = -1);
GSVideoMode GetVideoMode(); GSVideoMode GetVideoMode();
bool IsEnabled(int i); bool IsEnabled(int i);