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

Merge pull request #1225 from PCSX2-Alpha/scaling_fix 

GSDX: set a safe limit to Framebuffer width
This commit is contained in:
Gregory Hainaut 2016-03-12 15:42:18 +01:00
parent e7581f4e15 997f0535f5
commit a3788c4e98
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/GSdx/GSRendererHW.cpp
View File

@ -49,29 +49,29 @@ GSRendererHW::GSRendererHW(GSTextureCache* tc)
void GSRendererHW::SetScaling() void GSRendererHW::SetScaling()
{ {
int crtc_width = GetDisplayRect().width(); GSVector2i crtc_size(GetDisplayRect().width(), GetDisplayRect().height());
int crtc_height = GetDisplayRect().height();
// Framebuffer width is always a multiple of 64 so at certain cases it can't cover some weird width values. // Framebuffer width is always a multiple of 64 so at certain cases it can't cover some weird width values.
// 480P , 576P use width as 720 which is not referencable by FBW * 64. so it produces 704 ( the closest value multiple by 64). // 480P , 576P use width as 720 which is not referencable by FBW * 64. so it produces 704 ( the closest value multiple by 64).
// In such cases, let's just use the CRTC width. // In such cases, let's just use the CRTC width.
int fb_width = max((int)m_context->FRAME.FBW * 64, crtc_width); int fb_width = max({ (int)m_context->FRAME.FBW * 64, crtc_size.x , 512 });
// GS doesn't have a specific register for the FrameBuffer height. so we get the height // GS doesn't have a specific register for the FrameBuffer height. so we get the height
// from physical units of the display rectangle in case the game uses a heigher value of height. // from physical units of the display rectangle in case the game uses a heigher value of height.
int fb_height = (fb_width < 1024) ? max(512, crtc_height) : 1024; int fb_height = (fb_width < 1024) ? max(512, crtc_size.y) : 1024;
bool good_rt_size = m_width == (fb_width * m_upscale_multiplier) && m_height == (fb_height * m_upscale_multiplier);
bool initialized_register_state = ((m_context->FRAME.FBW * 64) > 1) && (crtc_height > 1); int upscaled_fb_w = fb_width * m_upscale_multiplier;
int upscaled_fb_h = fb_height * m_upscale_multiplier;
bool good_rt_size = m_width >= upscaled_fb_w && m_height >= upscaled_fb_h;
// No need to resize for native/custom resolutions as default size will be enough for native and we manually get RT Buffer size for custom. // No need to resize for native/custom resolutions as default size will be enough for native and we manually get RT Buffer size for custom.
// don't resize until the display rectangle and register states are stabilized. // don't resize until the display rectangle and register states are stabilized.
if ( m_upscale_multiplier <= 1 || good_rt_size || !initialized_register_state) if ( m_upscale_multiplier <= 1 || good_rt_size)
return; return;
m_tc->RemovePartial(); m_tc->RemovePartial();
m_width = fb_width * m_upscale_multiplier; m_width = upscaled_fb_w;
m_height = fb_height * m_upscale_multiplier; m_height = upscaled_fb_h;
printf("Frame buffer size set to %dx%d (%dx%d)\n", (m_width / m_upscale_multiplier), (m_height / m_upscale_multiplier), m_width, m_height); printf("Frame buffer size set to %dx%d (%dx%d)\n", fb_width, fb_height , m_width, m_height);
} }
GSRendererHW::~GSRendererHW() GSRendererHW::~GSRendererHW()