diff --git a/Data/Sys/GameSettings/C.ini b/Data/Sys/GameSettings/C.ini index f7e0cfc20b..874b6257d0 100644 --- a/Data/Sys/GameSettings/C.ini +++ b/Data/Sys/GameSettings/C.ini @@ -6,12 +6,10 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = [Video] [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False \ No newline at end of file diff --git a/Data/Sys/GameSettings/E.ini b/Data/Sys/GameSettings/E.ini index 9ae450375a..603b2b1f22 100644 --- a/Data/Sys/GameSettings/E.ini +++ b/Data/Sys/GameSettings/E.ini @@ -5,11 +5,9 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = EmulationStateId = 4 [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False \ No newline at end of file diff --git a/Data/Sys/GameSettings/F.ini b/Data/Sys/GameSettings/F.ini index 5d994f6337..330fa13e4f 100644 --- a/Data/Sys/GameSettings/F.ini +++ b/Data/Sys/GameSettings/F.ini @@ -9,6 +9,7 @@ EmulationIssues = Texture filtering will cause glitches. EmulationStateId = 4 [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 [Video_Hacks] @@ -24,6 +25,3 @@ EFBToTextureEnable = False [Video_Enhancements] MaxAnisotropy = 0 ForceFiltering = False - -[Wii] -Widescreen = False \ No newline at end of file diff --git a/Data/Sys/GameSettings/J.ini b/Data/Sys/GameSettings/J.ini index 6aba791807..b0dd2cb46f 100644 --- a/Data/Sys/GameSettings/J.ini +++ b/Data/Sys/GameSettings/J.ini @@ -5,11 +5,9 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = EmulationStateId = 4 [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False \ No newline at end of file diff --git a/Data/Sys/GameSettings/L.ini b/Data/Sys/GameSettings/L.ini index e9253ec598..5c9ae6ca7f 100644 --- a/Data/Sys/GameSettings/L.ini +++ b/Data/Sys/GameSettings/L.ini @@ -6,12 +6,10 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 UseXFB = True UseRealXFB = True - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/M.ini b/Data/Sys/GameSettings/M.ini index 8804de4675..95f131a441 100644 --- a/Data/Sys/GameSettings/M.ini +++ b/Data/Sys/GameSettings/M.ini @@ -5,11 +5,9 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = EmulationStateId = 4 [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/N.ini b/Data/Sys/GameSettings/N.ini index b90a265d94..0effba7558 100644 --- a/Data/Sys/GameSettings/N.ini +++ b/Data/Sys/GameSettings/N.ini @@ -1,4 +1,4 @@ # Nxxxxx - All Nintendo 64 Virtual Console games -[Wii] -Widescreen = False \ No newline at end of file +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/P.ini b/Data/Sys/GameSettings/P.ini index 75edcb535e..c2187354e6 100644 --- a/Data/Sys/GameSettings/P.ini +++ b/Data/Sys/GameSettings/P.ini @@ -1,4 +1,4 @@ -# Pxxxxx - All TurboGrafx 16 Virtual Console games +# Pxxxxx - All TurboGrafx 16 Virtual Console games # Note: there are a few weird GameCube games (mostly bonus disks) which also use this code. [Core] @@ -7,12 +7,10 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = [Video] [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/Q.ini b/Data/Sys/GameSettings/Q.ini index 57093ae36d..a4fc3cfeb3 100644 --- a/Data/Sys/GameSettings/Q.ini +++ b/Data/Sys/GameSettings/Q.ini @@ -3,12 +3,10 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = [Video] [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False \ No newline at end of file diff --git a/Data/Sys/GameSettings/R55.ini b/Data/Sys/GameSettings/R55.ini index b4c35df2da..a9a5548acc 100644 --- a/Data/Sys/GameSettings/R55.ini +++ b/Data/Sys/GameSettings/R55.ini @@ -18,7 +18,5 @@ EmulationIssues = # Add action replay cheats here. [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 0 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/RBI.ini b/Data/Sys/GameSettings/RBI.ini index 78b9f81ba4..b9b664589c 100644 --- a/Data/Sys/GameSettings/RBI.ini +++ b/Data/Sys/GameSettings/RBI.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RBL.ini b/Data/Sys/GameSettings/RBL.ini index a23ded7aad..843150c855 100644 --- a/Data/Sys/GameSettings/RBL.ini +++ b/Data/Sys/GameSettings/RBL.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RBT.ini b/Data/Sys/GameSettings/RBT.ini index 7fbe34d47a..6d239c667f 100644 --- a/Data/Sys/GameSettings/RBT.ini +++ b/Data/Sys/GameSettings/RBT.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RCC.ini b/Data/Sys/GameSettings/RCC.ini index be021284f7..fe72fe2403 100644 --- a/Data/Sys/GameSettings/RCC.ini +++ b/Data/Sys/GameSettings/RCC.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RCP.ini b/Data/Sys/GameSettings/RCP.ini index 2dee341ca3..26fc42b601 100644 --- a/Data/Sys/GameSettings/RCP.ini +++ b/Data/Sys/GameSettings/RCP.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RDB.ini b/Data/Sys/GameSettings/RDB.ini index a9c0d006bc..6bf9f7705b 100644 --- a/Data/Sys/GameSettings/RDB.ini +++ b/Data/Sys/GameSettings/RDB.ini @@ -18,7 +18,5 @@ EmulationIssues = # Add action replay cheats here. [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 512 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/RDS.ini b/Data/Sys/GameSettings/RDS.ini index 88ed147ac0..2de521fe40 100644 --- a/Data/Sys/GameSettings/RDS.ini +++ b/Data/Sys/GameSettings/RDS.ini @@ -18,7 +18,5 @@ EmulationIssues = # Add action replay cheats here. [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 512 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/RG2.ini b/Data/Sys/GameSettings/RG2.ini index cae02db207..d52dac1b90 100644 --- a/Data/Sys/GameSettings/RG2.ini +++ b/Data/Sys/GameSettings/RG2.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RGB.ini b/Data/Sys/GameSettings/RGB.ini index f3e6627afb..ef8d471fce 100644 --- a/Data/Sys/GameSettings/RGB.ini +++ b/Data/Sys/GameSettings/RGB.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RGM.ini b/Data/Sys/GameSettings/RGM.ini index 78d02fcd17..db3632ded3 100644 --- a/Data/Sys/GameSettings/RGM.ini +++ b/Data/Sys/GameSettings/RGM.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RGS.ini b/Data/Sys/GameSettings/RGS.ini index c8a58278f8..5284036bb0 100644 --- a/Data/Sys/GameSettings/RGS.ini +++ b/Data/Sys/GameSettings/RGS.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RI3.ini b/Data/Sys/GameSettings/RI3.ini index 3a6252ed71..064c12eb7a 100644 --- a/Data/Sys/GameSettings/RI3.ini +++ b/Data/Sys/GameSettings/RI3.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RKD.ini b/Data/Sys/GameSettings/RKD.ini index 1f572c3b8c..e0d9c29e3d 100644 --- a/Data/Sys/GameSettings/RKD.ini +++ b/Data/Sys/GameSettings/RKD.ini @@ -18,7 +18,5 @@ EmulationStateId = 5 # Add action replay cheats here. [Video_Settings] +SuggestedAspectRatio = 2 SafeTextureCacheColorSamples = 512 - -[Wii] -Widescreen = False diff --git a/Data/Sys/GameSettings/RLT.ini b/Data/Sys/GameSettings/RLT.ini index d25d02b017..9082953044 100644 --- a/Data/Sys/GameSettings/RLT.ini +++ b/Data/Sys/GameSettings/RLT.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RMP.ini b/Data/Sys/GameSettings/RMP.ini index 97668c7d66..b78565c26e 100644 --- a/Data/Sys/GameSettings/RMP.ini +++ b/Data/Sys/GameSettings/RMP.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RNX.ini b/Data/Sys/GameSettings/RNX.ini index 839e553599..8af542f855 100644 --- a/Data/Sys/GameSettings/RNX.ini +++ b/Data/Sys/GameSettings/RNX.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/ROD.ini b/Data/Sys/GameSettings/ROD.ini index 859fe103a8..7ec06f1b24 100644 --- a/Data/Sys/GameSettings/ROD.ini +++ b/Data/Sys/GameSettings/ROD.ini @@ -20,5 +20,5 @@ EmulationIssues = [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RPG.ini b/Data/Sys/GameSettings/RPG.ini index fe82052fbc..54dcc904fd 100644 --- a/Data/Sys/GameSettings/RPG.ini +++ b/Data/Sys/GameSettings/RPG.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RPY.ini b/Data/Sys/GameSettings/RPY.ini index 5a6f824146..7fac7f6e02 100644 --- a/Data/Sys/GameSettings/RPY.ini +++ b/Data/Sys/GameSettings/RPY.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RQW.ini b/Data/Sys/GameSettings/RQW.ini index f4929c785a..050ef11909 100644 --- a/Data/Sys/GameSettings/RQW.ini +++ b/Data/Sys/GameSettings/RQW.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RRB.ini b/Data/Sys/GameSettings/RRB.ini index 59f9a31496..3e51493a34 100644 --- a/Data/Sys/GameSettings/RRB.ini +++ b/Data/Sys/GameSettings/RRB.ini @@ -18,5 +18,5 @@ EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RS5.ini b/Data/Sys/GameSettings/RS5.ini index 6a26a73a27..1d2d026fcc 100644 --- a/Data/Sys/GameSettings/RS5.ini +++ b/Data/Sys/GameSettings/RS5.ini @@ -20,5 +20,5 @@ EmulationIssues = [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Data/Sys/GameSettings/RTR.ini b/Data/Sys/GameSettings/RTR.ini index 4018359748..c0e64fb508 100644 --- a/Data/Sys/GameSettings/RTR.ini +++ b/Data/Sys/GameSettings/RTR.ini @@ -17,5 +17,5 @@ EmulationIssues = [ActionReplay] # Add action replay cheats here. -[Wii] -Widescreen = False +[Video_Settings] +SuggestedAspectRatio = 2 diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index 11dc72f3fc..36dc3b289a 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -58,6 +58,8 @@ const ConfigInfo GFX_ADAPTER{{System::GFX, "Hardware", "Adapter"}, 0}; const ConfigInfo GFX_WIDESCREEN_HACK{{System::GFX, "Settings", "wideScreenHack"}, false}; const ConfigInfo GFX_ASPECT_RATIO{{System::GFX, "Settings", "AspectRatio"}, static_cast(ASPECT_AUTO)}; +const ConfigInfo GFX_SUGGESTED_ASPECT_RATIO{{System::GFX, "Settings", "SuggestedAspectRatio"}, + static_cast(ASPECT_AUTO)}; const ConfigInfo GFX_CROP{{System::GFX, "Settings", "Crop"}, false}; const ConfigInfo GFX_USE_XFB{{System::GFX, "Settings", "UseXFB"}, false}; const ConfigInfo GFX_USE_REAL_XFB{{System::GFX, "Settings", "UseRealXFB"}, false}; diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h index b1ec5c1dac..368c36093e 100644 --- a/Source/Core/Core/Config/GraphicsSettings.h +++ b/Source/Core/Core/Config/GraphicsSettings.h @@ -27,6 +27,7 @@ extern const ConfigInfo GFX_ADAPTER; extern const ConfigInfo GFX_WIDESCREEN_HACK; extern const ConfigInfo GFX_ASPECT_RATIO; +extern const ConfigInfo GFX_SUGGESTED_ASPECT_RATIO; extern const ConfigInfo GFX_CROP; extern const ConfigInfo GFX_USE_XFB; extern const ConfigInfo GFX_USE_REAL_XFB; diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp index 89a66be96f..67d5f2e4f4 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp @@ -72,6 +72,7 @@ static const INIToLocationMap& GetINIToLocationMap() {{"Video_Settings", "wideScreenHack"}, {Config::GFX_WIDESCREEN_HACK.location}}, {{"Video_Settings", "AspectRatio"}, {Config::GFX_ASPECT_RATIO.location}}, + {{"Video_Settings", "SuggestedAspectRatio"}, {Config::GFX_SUGGESTED_ASPECT_RATIO.location}}, {{"Video_Settings", "Crop"}, {Config::GFX_CROP.location}}, {{"Video_Settings", "UseXFB"}, {Config::GFX_USE_XFB.location}}, {{"Video_Settings", "UseRealXFB"}, {Config::GFX_USE_REAL_XFB.location}}, diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index abc4ef4731..d4097e5669 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -56,7 +56,11 @@ void VideoConfig::Refresh() iAdapter = Config::Get(Config::GFX_ADAPTER); bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK); - iAspectRatio = Config::Get(Config::GFX_ASPECT_RATIO); + const int aspect_ratio = Config::Get(Config::GFX_ASPECT_RATIO); + if (aspect_ratio == ASPECT_AUTO) + iAspectRatio = Config::Get(Config::GFX_SUGGESTED_ASPECT_RATIO); + else + iAspectRatio = aspect_ratio; bCrop = Config::Get(Config::GFX_CROP); bUseXFB = Config::Get(Config::GFX_USE_XFB); bUseRealXFB = Config::Get(Config::GFX_USE_REAL_XFB);