libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2024-12-26 11:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GSDX: Calculate dimensions of rectangle after merge

Browse Source 
* Properly display rectangle size after passing through merge circuit on
GS Dumps and GS Frame titlebar.
This commit is contained in:
Akash 2016-05-19 15:53:49 +05:30
parent 58b43dbb6c
commit 2166980f91
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSRenderer.h
View File

@ -69,7 +69,7 @@ public:
virtual bool CanUpscale() {return false;} virtual bool CanUpscale() {return false;}
virtual int GetUpscaleMultiplier() {return 1;} virtual int GetUpscaleMultiplier() {return 1;}
virtual GSVector2i GetInternalResolution() { virtual GSVector2i GetInternalResolution() {
return GSVector2i(GetDisplayRect().width(), GetDisplayRect().height()); return GetOutputRect();
} }
void SetAspectRatio(int aspect) {m_aspectratio = aspect;} void SetAspectRatio(int aspect) {m_aspectratio = aspect;}
void SetVSync(bool enabled); void SetVSync(bool enabled);

2
plugins/GSdx/GSRendererHW.cpp
View File

@ -116,7 +116,7 @@ int GSRendererHW::GetUpscaleMultiplier()
} }
GSVector2i GSRendererHW::GetInternalResolution() { GSVector2i GSRendererHW::GetInternalResolution() {
GSVector2i dr(GetDisplayRect().width(), GetDisplayRect().height()); GSVector2i dr = GetOutputRect();
if (m_upscale_multiplier) if (m_upscale_multiplier)
return GSVector2i(dr.x * m_upscale_multiplier, dr.y * m_upscale_multiplier); return GSVector2i(dr.x * m_upscale_multiplier, dr.y * m_upscale_multiplier);

22
plugins/GSdx/GSState.cpp
View File

@ -467,6 +467,28 @@ GSVector2i GSState::GetDeviceSize(int i)
return DeviceSize; return DeviceSize;
} }
GSVector2i GSState::GetOutputRect()
{
GSVector2i Merged_Rectangle(GetDisplayRect().width(), GetDisplayRect().height());
GSVector4i Rectangle[2] = { GetDisplayRect(0) , GetDisplayRect(1) };
int width[2] = { Rectangle[0].width() , Rectangle[1].width() };
int height[2] = { Rectangle[0].height() , Rectangle[1].height() };
int x_offset[2] = { Rectangle[0].left , Rectangle[1].left };
int y_offset[2] = { Rectangle[0].top , Rectangle[1].top };
if (!(IsEnabled(0) && IsEnabled(1)))
return Merged_Rectangle;
if (width[0] == width[1] && width[0] == std::max(x_offset[0], x_offset[1]) - std::min(x_offset[0], x_offset[1]))
Merged_Rectangle.x <<= 1;
if (height[0] == height[1] && height[0] == std::max(y_offset[0], y_offset[1]) - std::min(y_offset[0], y_offset[1]))
Merged_Rectangle.y <<= 1;
return Merged_Rectangle;
}
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,6 +239,7 @@ 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); GSVector2i GetDeviceSize(int i = -1);
GSVector2i GetOutputRect(); //Final Output rectangle after passing through merge circuit.
GSVideoMode GetVideoMode(); GSVideoMode GetVideoMode();
bool IsEnabled(int i); bool IsEnabled(int i);