ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7550 from JosJuice/widescreen-hack-suggested-ratio 

Fix the widescreen hack for Wii games with 4:3 forced in game INI
This commit is contained in:
Pierre Bourdon 2018-11-09 04:28:31 +01:00 committed by GitHub
parent 98d2e278b0 a42432cae4
commit 541c5ee996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,8 +85,7 @@ Renderer::Renderer(int backbuffer_width, int backbuffer_height)
UpdateDrawRectangle(); UpdateDrawRectangle();
CalculateTargetSize(); CalculateTargetSize();
if (SConfig::GetInstance().bWii) m_aspect_wide = SConfig::GetInstance().bWii && Config::Get(Config::SYSCONF_WIDESCREEN);
m_aspect_wide = Config::Get(Config::SYSCONF_WIDESCREEN);
m_last_host_config_bits = ShaderHostConfig::GetCurrent().bits; m_last_host_config_bits = ShaderHostConfig::GetCurrent().bits;
m_last_efb_multisamples = g_ActiveConfig.iMultisamples; m_last_efb_multisamples = g_ActiveConfig.iMultisamples;
@ -639,9 +638,19 @@ void Renderer::RecordVideoMemory()
void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc,
u64 ticks) u64 ticks)
{ {
// Heuristic to detect if a GameCube game is in 16:9 anamorphic widescreen mode. const AspectMode suggested = g_ActiveConfig.suggested_aspect_mode;
if (!SConfig::GetInstance().bWii) if (suggested == AspectMode::Analog || suggested == AspectMode::AnalogWide)
{ {
m_aspect_wide = suggested == AspectMode::AnalogWide;
}
else if (SConfig::GetInstance().bWii)
{
m_aspect_wide = Config::Get(Config::SYSCONF_WIDESCREEN);
}
else
{
// Heuristic to detect if a GameCube game is in 16:9 anamorphic widescreen mode.
size_t flush_count_4_3, flush_count_anamorphic; size_t flush_count_4_3, flush_count_anamorphic;
std::tie(flush_count_4_3, flush_count_anamorphic) = std::tie(flush_count_4_3, flush_count_anamorphic) =
g_vertex_manager->ResetFlushAspectRatioCount(); g_vertex_manager->ResetFlushAspectRatioCount();

3
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -62,8 +62,9 @@ void VideoConfig::Refresh()
bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK); bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK);
const AspectMode config_aspect_mode = Config::Get(Config::GFX_ASPECT_RATIO); const AspectMode config_aspect_mode = Config::Get(Config::GFX_ASPECT_RATIO);
suggested_aspect_mode = Config::Get(Config::GFX_SUGGESTED_ASPECT_RATIO);
if (config_aspect_mode == AspectMode::Auto) if (config_aspect_mode == AspectMode::Auto)
aspect_mode = Config::Get(Config::GFX_SUGGESTED_ASPECT_RATIO); aspect_mode = suggested_aspect_mode;
else else
aspect_mode = config_aspect_mode; aspect_mode = config_aspect_mode;
bCrop = Config::Get(Config::GFX_CROP); bCrop = Config::Get(Config::GFX_CROP);

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

@ -62,6 +62,7 @@ struct VideoConfig final
bool bVSync; bool bVSync;
bool bWidescreenHack; bool bWidescreenHack;
AspectMode aspect_mode; AspectMode aspect_mode;
AspectMode suggested_aspect_mode;
bool bCrop; // Aspect ratio controls. bool bCrop; // Aspect ratio controls.
bool bShaderCache; bool bShaderCache;