Guest User

Untitled

a guest
Jan 6th, 2014
705
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
  2. index 2bb4afd..310b038 100644
  3. --- a/Source/Core/DolphinWX/Frame.cpp
  4. +++ b/Source/Core/DolphinWX/Frame.cpp
  5. @@ -884,7 +884,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
  6. {
  7. OSDChoice = 1;
  8. // Toggle native resolution
  9. - if (++g_Config.iEFBScale > SCALE_4X)
  10. + if (++g_Config.iEFBScale > SCALE_6X)
  11. g_Config.iEFBScale = SCALE_AUTO;
  12. }
  13. else if (IsHotkey(event, HK_TOGGLE_AR))
  14. diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
  15. index 34923a4..d3b3bdd 100644
  16. --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp
  17. +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
  18. @@ -344,7 +344,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
  19. {
  20. const wxString efbscale_choices[] = { _("Auto (Window Size)"), _("Auto (Multiple of 640x528)"),
  21. _("1x Native (640x528)"), _("1.5x Native (960x792)"), _("2x Native (1280x1056)"),
  22. - _("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)") };
  23. + _("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)"),
  24. + _("5x Native (3200x2640)"), _("6x Native (3840x3168)") };
  25.  
  26. wxChoice *const choice_efbscale = CreateChoice(page_enh,
  27. vconfig.iEFBScale, wxGetTranslation(internal_res_desc), sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices);
  28. diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
  29. index e509ccb..c25a30b 100644
  30. --- a/Source/Core/VideoCommon/RenderBase.cpp
  31. +++ b/Source/Core/VideoCommon/RenderBase.cpp
  32. @@ -199,6 +199,16 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int
  33. efb_scale_denominatorX = efb_scale_denominatorY = 1;
  34. break;
  35.  
  36. + case 8: // 5x
  37. + efb_scale_numeratorX = efb_scale_numeratorY = 5;
  38. + efb_scale_denominatorX = efb_scale_denominatorY = 1;
  39. + break;
  40. +
  41. + case 9: //6x
  42. + efb_scale_numeratorX = efb_scale_numeratorY = 6;
  43. + efb_scale_denominatorX = efb_scale_denominatorY = 1;
  44. + break;
  45. +
  46. default: // fractional & integral handled later
  47. break;
  48. }
  49. @@ -282,6 +292,12 @@ void Renderer::DrawDebugText()
  50. case SCALE_4X:
  51. res_text = "4x";
  52. break;
  53. + case SCALE_5X:
  54. + res_text = "5x";
  55. + break;
  56. + case SCALE_6X:
  57. + res_text = "6x";
  58. + break;
  59. }
  60.  
  61. const char* ar_text = "";
  62. diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
  63. index 71d0b7f..03ad3e7 100644
  64. --- a/Source/Core/VideoCommon/VideoConfig.h
  65. +++ b/Source/Core/VideoCommon/VideoConfig.h
  66. @@ -41,6 +41,8 @@ enum EFBScale {
  67. SCALE_2_5X,
  68. SCALE_3X,
  69. SCALE_4X,
  70. + SCALE_5X,
  71. + SCALE_6X,
  72. };
  73.  
  74. class IniFile;
RAW Paste Data