mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Merge pull request #5867 from leoetlino/widescreen
GameINI: Replace Wii.Widescreen with AspectRatio
This commit is contained in:
@ -6,12 +6,10 @@
|
|||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
@ -5,11 +5,9 @@
|
|||||||
|
|
||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
@ -9,6 +9,7 @@ EmulationIssues = Texture filtering will cause glitches.
|
|||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
@ -24,6 +25,3 @@ EFBToTextureEnable = False
|
|||||||
[Video_Enhancements]
|
[Video_Enhancements]
|
||||||
MaxAnisotropy = 0
|
MaxAnisotropy = 0
|
||||||
ForceFiltering = False
|
ForceFiltering = False
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
@ -5,11 +5,9 @@
|
|||||||
|
|
||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
@ -6,12 +6,10 @@
|
|||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
UseXFB = True
|
UseXFB = True
|
||||||
UseRealXFB = True
|
UseRealXFB = True
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -5,11 +5,9 @@
|
|||||||
|
|
||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Nxxxxx - All Nintendo 64 Virtual Console games
|
# Nxxxxx - All Nintendo 64 Virtual Console games
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -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.
|
# Note: there are a few weird GameCube games (mostly bonus disks) which also use this code.
|
||||||
|
|
||||||
[Core]
|
[Core]
|
||||||
@ -7,12 +7,10 @@
|
|||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -3,12 +3,10 @@
|
|||||||
[EmuState]
|
[EmuState]
|
||||||
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
# The Emulation State. 1 is worst, 5 is best, 0 is not set.
|
||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
@ -18,7 +18,5 @@ EmulationIssues =
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 0
|
SafeTextureCacheColorSamples = 0
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -18,7 +18,5 @@ EmulationIssues =
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 512
|
SafeTextureCacheColorSamples = 512
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -18,7 +18,5 @@ EmulationIssues =
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 512
|
SafeTextureCacheColorSamples = 512
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -18,7 +18,5 @@ EmulationStateId = 5
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video_Settings]
|
[Video_Settings]
|
||||||
|
SuggestedAspectRatio = 2
|
||||||
SafeTextureCacheColorSamples = 512
|
SafeTextureCacheColorSamples = 512
|
||||||
|
|
||||||
[Wii]
|
|
||||||
Widescreen = False
|
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -20,5 +20,5 @@ EmulationIssues =
|
|||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
EFBEmulateFormatChanges = True
|
EFBEmulateFormatChanges = True
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -18,5 +18,5 @@ EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -20,5 +20,5 @@ EmulationIssues =
|
|||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
EFBEmulateFormatChanges = True
|
EFBEmulateFormatChanges = True
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -17,5 +17,5 @@ EmulationIssues =
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Wii]
|
[Video_Settings]
|
||||||
Widescreen = False
|
SuggestedAspectRatio = 2
|
||||||
|
@ -58,6 +58,8 @@ const ConfigInfo<int> GFX_ADAPTER{{System::GFX, "Hardware", "Adapter"}, 0};
|
|||||||
const ConfigInfo<bool> GFX_WIDESCREEN_HACK{{System::GFX, "Settings", "wideScreenHack"}, false};
|
const ConfigInfo<bool> GFX_WIDESCREEN_HACK{{System::GFX, "Settings", "wideScreenHack"}, false};
|
||||||
const ConfigInfo<int> GFX_ASPECT_RATIO{{System::GFX, "Settings", "AspectRatio"},
|
const ConfigInfo<int> GFX_ASPECT_RATIO{{System::GFX, "Settings", "AspectRatio"},
|
||||||
static_cast<int>(ASPECT_AUTO)};
|
static_cast<int>(ASPECT_AUTO)};
|
||||||
|
const ConfigInfo<int> GFX_SUGGESTED_ASPECT_RATIO{{System::GFX, "Settings", "SuggestedAspectRatio"},
|
||||||
|
static_cast<int>(ASPECT_AUTO)};
|
||||||
const ConfigInfo<bool> GFX_CROP{{System::GFX, "Settings", "Crop"}, false};
|
const ConfigInfo<bool> GFX_CROP{{System::GFX, "Settings", "Crop"}, false};
|
||||||
const ConfigInfo<bool> GFX_USE_XFB{{System::GFX, "Settings", "UseXFB"}, false};
|
const ConfigInfo<bool> GFX_USE_XFB{{System::GFX, "Settings", "UseXFB"}, false};
|
||||||
const ConfigInfo<bool> GFX_USE_REAL_XFB{{System::GFX, "Settings", "UseRealXFB"}, false};
|
const ConfigInfo<bool> GFX_USE_REAL_XFB{{System::GFX, "Settings", "UseRealXFB"}, false};
|
||||||
|
@ -27,6 +27,7 @@ extern const ConfigInfo<int> GFX_ADAPTER;
|
|||||||
|
|
||||||
extern const ConfigInfo<bool> GFX_WIDESCREEN_HACK;
|
extern const ConfigInfo<bool> GFX_WIDESCREEN_HACK;
|
||||||
extern const ConfigInfo<int> GFX_ASPECT_RATIO;
|
extern const ConfigInfo<int> GFX_ASPECT_RATIO;
|
||||||
|
extern const ConfigInfo<int> GFX_SUGGESTED_ASPECT_RATIO;
|
||||||
extern const ConfigInfo<bool> GFX_CROP;
|
extern const ConfigInfo<bool> GFX_CROP;
|
||||||
extern const ConfigInfo<bool> GFX_USE_XFB;
|
extern const ConfigInfo<bool> GFX_USE_XFB;
|
||||||
extern const ConfigInfo<bool> GFX_USE_REAL_XFB;
|
extern const ConfigInfo<bool> GFX_USE_REAL_XFB;
|
||||||
|
@ -72,6 +72,7 @@ static const INIToLocationMap& GetINIToLocationMap()
|
|||||||
|
|
||||||
{{"Video_Settings", "wideScreenHack"}, {Config::GFX_WIDESCREEN_HACK.location}},
|
{{"Video_Settings", "wideScreenHack"}, {Config::GFX_WIDESCREEN_HACK.location}},
|
||||||
{{"Video_Settings", "AspectRatio"}, {Config::GFX_ASPECT_RATIO.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", "Crop"}, {Config::GFX_CROP.location}},
|
||||||
{{"Video_Settings", "UseXFB"}, {Config::GFX_USE_XFB.location}},
|
{{"Video_Settings", "UseXFB"}, {Config::GFX_USE_XFB.location}},
|
||||||
{{"Video_Settings", "UseRealXFB"}, {Config::GFX_USE_REAL_XFB.location}},
|
{{"Video_Settings", "UseRealXFB"}, {Config::GFX_USE_REAL_XFB.location}},
|
||||||
|
@ -56,7 +56,11 @@ void VideoConfig::Refresh()
|
|||||||
iAdapter = Config::Get(Config::GFX_ADAPTER);
|
iAdapter = Config::Get(Config::GFX_ADAPTER);
|
||||||
|
|
||||||
bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK);
|
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);
|
bCrop = Config::Get(Config::GFX_CROP);
|
||||||
bUseXFB = Config::Get(Config::GFX_USE_XFB);
|
bUseXFB = Config::Get(Config::GFX_USE_XFB);
|
||||||
bUseRealXFB = Config::Get(Config::GFX_USE_REAL_XFB);
|
bUseRealXFB = Config::Get(Config::GFX_USE_REAL_XFB);
|
||||||
|
Reference in New Issue
Block a user