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

GSDX: Fixed up some of the scaling height settings 

-Last commit broke Snowblind games again
-Width now based on output circuit
-Try to use the smallest possible while being at least the size of the screen
This commit is contained in:
refractionpcsx2 2015-06-05 00:12:15 +01:00
parent 6f4ec98bc3
commit 91f775f3f0
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/GSdx/GSRendererHW.cpp
View File

@ -23,8 +23,8 @@
#include "GSRendererHW.h" #include "GSRendererHW.h"
GSRendererHW::GSRendererHW(GSTextureCache* tc) GSRendererHW::GSRendererHW(GSTextureCache* tc)
: m_width(1024) : m_width(640)
, m_height(1024) , m_height(512)
, m_skip(0) , m_skip(0)
, m_reset(false) , m_reset(false)
, m_upscale_multiplier(1) , m_upscale_multiplier(1)
@ -37,26 +37,43 @@ GSRendererHW::GSRendererHW(GSTextureCache* tc)
} }
void GSRendererHW::SetScaling() { void GSRendererHW::SetScaling() {
int env = IsEnabled(1) ? 1 : 0;
m_buffer_size = max(m_context->FRAME.FBW, m_regs->DISP[env].DISPFB.FBW);
if (!m_regs->PMODE.EN1 && !m_regs->PMODE.EN2){
m_buffer_size = m_context->FRAME.FBW;
}
else {
m_buffer_size = m_regs->DISP[m_regs->PMODE.EN1 == 1 ? 0 : 1].DISPFB.FBW;
}
//m_buffer_size = max(m_context->FRAME.FBW, m_regs->DISP[env].DISPFB.FBW);
//Only increase the buffer size, don't make it smaller, it breaks games (GH3) //Only increase the buffer size, don't make it smaller, it breaks games (GH3)
if (m_upscale_multiplier <= 6 && (m_width / m_upscale_multiplier) < (m_buffer_size * 64)){ if (m_width < ((m_buffer_size * 64) * m_upscale_multiplier)){
printf("Frame buffer width on vsync %d m_width %d\n", m_buffer_size, (m_width / m_upscale_multiplier));
m_tc->RemovePartial(); m_tc->RemovePartial();
} }
else { else {
return; return;
} }
//printf("FBW1 %d FBW2 %d Context FBW %d PMODE 1 %d 2 %d", m_regs->DISP[0].DISPFB.FBW, m_regs->DISP[1].DISPFB.FBW, m_context->FRAME.FBW, m_regs->PMODE.EN1, m_regs->PMODE.EN2);
if (!m_regs->PMODE.EN1 && !m_regs->PMODE.EN2){
m_height = (m_buffer_size * 64) <= 640 ? 512 : (int)((m_buffer_size * 64)*0.8);
printf("fb");
}
else {
m_height = m_regs->DISP[m_regs->PMODE.EN1 == 1 ? 0 : 1].DISPLAY.DH + 1;
printf("ds");
}
if (!m_nativeres) if (!m_nativeres)
{ {
m_width = theApp.GetConfig("resx", m_width);
m_height = theApp.GetConfig("resy", m_height);
m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", m_upscale_multiplier); m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", m_upscale_multiplier);
if (m_upscale_multiplier == 1) { //Custom
m_width = theApp.GetConfig("resx", m_width);
m_height = theApp.GetConfig("resy", m_height);
}
if (m_upscale_multiplier > 6) if (m_upscale_multiplier > 6)
{ {
m_upscale_multiplier = 1; // use the normal upscale math m_upscale_multiplier = 1; // use the normal upscale math
@ -65,8 +82,9 @@ void GSRendererHW::SetScaling() {
{ {
m_width = (m_buffer_size * 64) * m_upscale_multiplier; m_width = (m_buffer_size * 64) * m_upscale_multiplier;
// A square RT consumes too much memory (Gran Turismo 4) // A square RT consumes too much memory (Gran Turismo 4)
// Let's keep the smallest size as possible //Smaller resolutions can be strange, but if it's huge they are generally uniform.
m_height = 512 * m_upscale_multiplier; //m_height = m_width; //Keep it square //Watch this bite me in the ass :P
m_height *= m_upscale_multiplier;
} }
} }
else else
@ -78,13 +96,12 @@ void GSRendererHW::SetScaling() {
// No upscaling hack at native resolution // No upscaling hack at native resolution
if (m_nativeres) { if (m_nativeres) {
m_width = (m_buffer_size * 64); m_width = (m_buffer_size * 64);
m_height = m_width; //Keep it square
} }
m_userhacks_round_sprite_offset = 0; m_userhacks_round_sprite_offset = 0;
m_userhacks_align_sprite_X = 0; m_userhacks_align_sprite_X = 0;
} }
printf("Frame buffer width %d m_width set to %d multiplier %d", m_buffer_size, m_width, m_upscale_multiplier); 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);
} }
GSRendererHW::~GSRendererHW() GSRendererHW::~GSRendererHW()