Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
- index 2bb4afd..310b038 100644
- --- a/Source/Core/DolphinWX/Frame.cpp
- +++ b/Source/Core/DolphinWX/Frame.cpp
- @@ -884,7 +884,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
- {
- OSDChoice = 1;
- // Toggle native resolution
- - if (++g_Config.iEFBScale > SCALE_4X)
- + if (++g_Config.iEFBScale > SCALE_6X)
- g_Config.iEFBScale = SCALE_AUTO;
- }
- else if (IsHotkey(event, HK_TOGGLE_AR))
- diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
- index 34923a4..d3b3bdd 100644
- --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp
- +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
- @@ -344,7 +344,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
- {
- const wxString efbscale_choices[] = { _("Auto (Window Size)"), _("Auto (Multiple of 640x528)"),
- _("1x Native (640x528)"), _("1.5x Native (960x792)"), _("2x Native (1280x1056)"),
- - _("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)") };
- + _("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)"),
- + _("5x Native (3200x2640)"), _("6x Native (3840x3168)") };
- wxChoice *const choice_efbscale = CreateChoice(page_enh,
- vconfig.iEFBScale, wxGetTranslation(internal_res_desc), sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices);
- diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
- index e509ccb..c25a30b 100644
- --- a/Source/Core/VideoCommon/RenderBase.cpp
- +++ b/Source/Core/VideoCommon/RenderBase.cpp
- @@ -199,6 +199,16 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int
- efb_scale_denominatorX = efb_scale_denominatorY = 1;
- break;
- + case 8: // 5x
- + efb_scale_numeratorX = efb_scale_numeratorY = 5;
- + efb_scale_denominatorX = efb_scale_denominatorY = 1;
- + break;
- +
- + case 9: //6x
- + efb_scale_numeratorX = efb_scale_numeratorY = 6;
- + efb_scale_denominatorX = efb_scale_denominatorY = 1;
- + break;
- +
- default: // fractional & integral handled later
- break;
- }
- @@ -282,6 +292,12 @@ void Renderer::DrawDebugText()
- case SCALE_4X:
- res_text = "4x";
- break;
- + case SCALE_5X:
- + res_text = "5x";
- + break;
- + case SCALE_6X:
- + res_text = "6x";
- + break;
- }
- const char* ar_text = "";
- diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
- index 71d0b7f..03ad3e7 100644
- --- a/Source/Core/VideoCommon/VideoConfig.h
- +++ b/Source/Core/VideoCommon/VideoConfig.h
- @@ -41,6 +41,8 @@ enum EFBScale {
- SCALE_2_5X,
- SCALE_3X,
- SCALE_4X,
- + SCALE_5X,
- + SCALE_6X,
- };
- class IniFile;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement