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

GSdx-PCRTC: Improve output circuit selection 

Previously, the auto output circuit selection of the GSdx wasn't good, it simply defaulted to the second output circuit even when the first output circuit is also enabled. The new algorithm for auto selecting returns the merged rectangle dimensions when both of the output circuits are enabled and if the condition for merge is not satisfied then it returns the bigger output circuit.
This commit is contained in:
Akash 2017-01-23 10:06:37 +05:30 committed by Gregory Hainaut
parent bccc3ef253
commit a2cdcb4e4d
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/GSdx/GSState.cpp
View File

@ -405,9 +405,27 @@ GSVideoMode GSState::GetVideoMode()
return videomode;
}
GSVector4i GSState::GetDisplayRect(int i, bool merged_rect)
GSVector4i GSState::GetDisplayRect(int i)
{
if(i < 0) i = IsEnabled(1) ? 1 : 0;
if (!IsEnabled(0) && !IsEnabled(1))
return GSVector4i(0);
// If no specific context is requested then pass the merged rectangle as return value
if (i == -1)
{
if (m_regs->PMODE.EN1 & m_regs->PMODE.EN2)
{
GSVector4i r[2] = { GetDisplayRect(0), GetDisplayRect(1) };
GSVector4i r_intersect = r[0].rintersect(r[1]);
GSVector4i r_union = r[0].runion_ordered(r[1]);
// If the conditions for passing the merged rectangle is unsatisfied, then
// pass the rectangle with the bigger size.
bool can_be_merged = !r_intersect.width() || !r_intersect.height() || r_intersect.xyxy().eq(r_union.xyxy());
return (can_be_merged) ? r_union : r[r[1].rarea() > r[0].rarea()];
}
i = m_regs->PMODE.EN2;
}
GSVideoMode videomode = GetVideoMode();
GSVector2i magnification (m_regs->DISP[i].DISPLAY.MAGH + 1, m_regs->DISP[i].DISPLAY.MAGV + 1);
@ -433,17 +451,6 @@ GSVector4i GSState::GetDisplayRect(int i, bool merged_rect)
rectangle.right = rectangle.left + width;
rectangle.bottom = rectangle.top + height;
if ((m_regs->PMODE.EN1 & m_regs->PMODE.EN2) && merged_rect)
{
GSVector4i opposite_output = GetDisplayRect(!i);
GSVector4i r_intersect = opposite_output.rintersect(rectangle);
GSVector4i r_union = opposite_output.runion_ordered(rectangle);
if(!(r_intersect.width() && r_intersect.height()) ||
r_intersect.xyxy().eq(r_union.xyxy()))
return r_union;
}
return rectangle;
}
@ -491,13 +498,9 @@ bool GSState::IsEnabled(int i)
{
ASSERT(i >= 0 && i < 2);
if(i == 0 && m_regs->PMODE.EN1)
if ((i == 0 && m_regs->PMODE.EN1) || (i == 1 && m_regs->PMODE.EN2))
{
return m_regs->DISP[0].DISPLAY.DW || m_regs->DISP[0].DISPLAY.DH;
}
else if(i == 1 && m_regs->PMODE.EN2)
{
return m_regs->DISP[1].DISPLAY.DW || m_regs->DISP[1].DISPLAY.DH;
return m_regs->DISP[i].DISPLAY.DW && m_regs->DISP[i].DISPLAY.DH;
}
return false;

2
plugins/GSdx/GSState.h
View File

@ -243,7 +243,7 @@ public:
void ResetHandlers();
int GetFramebufferHeight();
GSVector4i GetDisplayRect(int i = -1, bool merged_rect = false);
GSVector4i GetDisplayRect(int i = -1);
GSVector4i GetFrameRect(int i = -1);
GSVideoMode GetVideoMode();

4
plugins/GSdx/GSTextureCache.cpp
View File

@ -421,8 +421,8 @@ void GSTextureCache::ScaleTexture(GSTexture* texture)
if (custom_resolution)
{
int width = m_renderer->GetDisplayRect(-1, true).width();
int height = m_renderer->GetDisplayRect(-1, true).height();
int width = m_renderer->GetDisplayRect().width();
int height = m_renderer->GetDisplayRect().height();
GSVector2i requested_resolution = m_renderer->GetCustomResolution();
scale_factor.x = static_cast<float>(requested_resolution.x) / width;

5
plugins/GSdx/GSVector.h
View File

@ -236,6 +236,11 @@ public:
return *this - xyxy(); // same as GSVector4i(0, 0, width(), height());
}
__forceinline unsigned int rarea() const
{
return width() * height();
}
__forceinline bool rempty() const
{
return (*this < zwzw()).mask() != 0x00ff;