piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6290 from JosJuice/invalid-aspect-ratio

Browse Source 
Treat invalid aspect ratio setting values as Auto
This commit is contained in:
Markus Wick
2018-01-08 13:46:30 +01:00
committed by GitHub
parent 29e8806d09 1557e6ab05
commit 22f469697b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -307,9 +307,6 @@ void Renderer::DrawDebugText()
const char* ar_text = ""; const char* ar_text = "";
switch (g_ActiveConfig.aspect_mode) switch (g_ActiveConfig.aspect_mode)
{ {
case AspectMode::Auto:
ar_text = "Auto";
break;
case AspectMode::Stretch: case AspectMode::Stretch:
ar_text = "Stretch"; ar_text = "Stretch";
break; break;
@ -319,6 +316,10 @@ void Renderer::DrawDebugText()
case AspectMode::AnalogWide: case AspectMode::AnalogWide:
ar_text = "Force 16:9"; ar_text = "Force 16:9";
break; break;
case AspectMode::Auto:
default:
ar_text = "Auto";
break;
} }
const char* const efbcopy_text = g_ActiveConfig.bSkipEFBCopyToRam ? "to Texture" : "to RAM"; const char* const efbcopy_text = g_ActiveConfig.bSkipEFBCopyToRam ? "to Texture" : "to RAM";
@ -441,6 +442,7 @@ void Renderer::UpdateDrawRectangle()
target_aspect = AspectToWidescreen(VideoInterface::GetAspectRatio()); target_aspect = AspectToWidescreen(VideoInterface::GetAspectRatio());
break; break;
case AspectMode::Auto: case AspectMode::Auto:
default:
target_aspect = source_aspect; target_aspect = source_aspect;
break; break;
} }

4
Source/Core/VideoCommon/VideoConfig.h
View File

@ -24,7 +24,7 @@
constexpr int EFB_SCALE_AUTO_INTEGRAL = 0; constexpr int EFB_SCALE_AUTO_INTEGRAL = 0;
enum class AspectMode enum class AspectMode : int
{ {
Auto, Auto,
AnalogWide, AnalogWide,
@ -32,7 +32,7 @@ enum class AspectMode
Stretch, Stretch,
}; };
enum class StereoMode enum class StereoMode : int
{ {
Off, Off,
SBS, SBS,