From d541f28425bb4963603a5a38e67c5bb40e420665 Mon Sep 17 00:00:00 2001 From: feal87 Date: Tue, 2 Mar 2010 13:48:20 +0000 Subject: [PATCH] Gsdx : Added scaler x5 and x6 (the maximum available, no other values are possible as the limit for texture/render target is 4096x4096 (probably some new card/API support more, but we need compatibility) and with x6 we are at 3840x3072). It is VERY gpu intensive, use it with extreme care, it may give heavy slowdown. :P git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2658 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/GSdx/GSRenderer.cpp | 2 +- plugins/GSdx/GSRendererHW.h | 2 +- plugins/GSdx/GSSettingsDlg.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/GSdx/GSRenderer.cpp b/plugins/GSdx/GSRenderer.cpp index 6b307f2864..73d8393587 100644 --- a/plugins/GSdx/GSRenderer.cpp +++ b/plugins/GSdx/GSRenderer.cpp @@ -37,7 +37,7 @@ GSRenderer::GSRenderer() m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", 1); if(m_nativeres) m_upscale_multiplier = 1; - else if (m_upscale_multiplier > 4) m_upscale_multiplier = 1; + else if (m_upscale_multiplier > 6) m_upscale_multiplier = 1; m_aa1 = !!theApp.GetConfig("aa1", 0); diff --git a/plugins/GSdx/GSRendererHW.h b/plugins/GSdx/GSRendererHW.h index 0c178d7626..4726aa5066 100644 --- a/plugins/GSdx/GSRendererHW.h +++ b/plugins/GSdx/GSRendererHW.h @@ -721,7 +721,7 @@ public: m_width = theApp.GetConfig("resx", m_width); m_height = theApp.GetConfig("resy", m_height); m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", m_upscale_multiplier); - if (m_upscale_multiplier > 4) m_upscale_multiplier = 1; //use the normal upscale math + if (m_upscale_multiplier > 6) m_upscale_multiplier = 1; //use the normal upscale math if (m_upscale_multiplier > 1) { m_width = 640 * m_upscale_multiplier; //512 is also common, but this is not always detected right. diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 0ef497f4e3..bd123094da 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -69,6 +69,8 @@ GSSetting GSSettingsDlg::g_upscale_multiplier[] = {2, "2x", NULL}, {3, "3x", NULL}, {4, "4x", NULL}, + {5, "5x", NULL}, + {6, "6x", NULL}, }; GSSettingsDlg::GSSettingsDlg( bool isOpen2 )