From 8b743dfe9c6e6d4003900987f25012974374d6bb Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 23 Apr 2026 12:06:40 -0700 Subject: [PATCH 1/4] HotkeyManager: Unabbreviate HK_TOGGLE_STEREO_SBS Rename HK_TOGGLE_STEREO_SBS to HK_TOGGLE_STEREO_SIDE_BY_SIDE. --- Source/Core/Core/HotkeyManager.cpp | 2 +- Source/Core/Core/HotkeyManager.h | 2 +- Source/Core/DolphinQt/HotkeyScheduler.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 92c6f2b831..47e511e813 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -314,7 +314,7 @@ constexpr std::array s_groups_info = { {_trans("Internal Resolution"), HK_INCREASE_IR, HK_DECREASE_IR}, {_trans("Freelook"), HK_FREELOOK_TOGGLE, HK_FREELOOK_TOGGLE}, // i18n: Stereoscopic 3D - {_trans("3D"), HK_TOGGLE_STEREO_SBS, HK_TOGGLE_STEREO_ANAGLYPH}, + {_trans("3D"), HK_TOGGLE_STEREO_SIDE_BY_SIDE, HK_TOGGLE_STEREO_ANAGLYPH}, // i18n: Stereoscopic 3D {_trans("3D Depth"), HK_DECREASE_DEPTH, HK_INCREASE_CONVERGENCE}, {_trans("Load State"), HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_SELECTED}, diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 7fb4fb77ac..46dc40df0b 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -107,7 +107,7 @@ enum Hotkey HK_FREELOOK_TOGGLE, - HK_TOGGLE_STEREO_SBS, + HK_TOGGLE_STEREO_SIDE_BY_SIDE, HK_TOGGLE_STEREO_TAB, HK_TOGGLE_STEREO_ANAGLYPH, diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index e2722e9cfe..3b6e095f40 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -551,7 +551,7 @@ void HotkeyScheduler::Run() emit DecrementSelectedStateSlotHotkey(); // Stereoscopy - if (IsHotkey(HK_TOGGLE_STEREO_SBS)) + if (IsHotkey(HK_TOGGLE_STEREO_SIDE_BY_SIDE)) { if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::SBS) { From 59eef9d4d8e653549e87907f60cc3c559dab9f4f Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 23 Apr 2026 12:08:41 -0700 Subject: [PATCH 2/4] HotkeyManager: Unabbreviate HK_TOGGLE_STEREO_TAB Rename HK_TOGGLE_STEREO_TAB to HK_TOGGLE_STEREO_TOP_AND_BOTTOM. --- Source/Core/Core/HotkeyManager.h | 2 +- Source/Core/DolphinQt/HotkeyScheduler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 46dc40df0b..b367c6b3c1 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -108,7 +108,7 @@ enum Hotkey HK_FREELOOK_TOGGLE, HK_TOGGLE_STEREO_SIDE_BY_SIDE, - HK_TOGGLE_STEREO_TAB, + HK_TOGGLE_STEREO_TOP_AND_BOTTOM, HK_TOGGLE_STEREO_ANAGLYPH, HK_DECREASE_DEPTH, diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index 3b6e095f40..fd2eb0f6a2 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -567,7 +567,7 @@ void HotkeyScheduler::Run() } } - if (IsHotkey(HK_TOGGLE_STEREO_TAB)) + if (IsHotkey(HK_TOGGLE_STEREO_TOP_AND_BOTTOM)) { if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::TAB) { From 655ee270e7358d3f179cb0cfabdb95fabdbaa4fc Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 23 Apr 2026 12:09:54 -0700 Subject: [PATCH 3/4] VideoConfig: Rename StereoMode::SBS to StereoMode::SideBySide --- Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp | 4 ++-- Source/Core/DolphinQt/HotkeyScheduler.cpp | 4 ++-- Source/Core/VideoCommon/PostProcessing.cpp | 2 +- Source/Core/VideoCommon/Present.cpp | 4 ++-- Source/Core/VideoCommon/VideoConfig.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp index a1864b3b77..ccbade9da0 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp @@ -241,7 +241,7 @@ void EnhancementsWidget::CreateWidgets() m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue())); auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE); - if (current_stereo_mode != StereoMode::SBS && current_stereo_mode != StereoMode::TAB) + if (current_stereo_mode != StereoMode::SideBySide && current_stereo_mode != StereoMode::TAB) m_3d_per_eye_resolution->hide(); main_layout->addWidget(enhancements_box); @@ -257,7 +257,7 @@ void EnhancementsWidget::ConnectWidgets() auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE); LoadPostProcessingShaders(); - if (current_stereo_mode == StereoMode::SBS || current_stereo_mode == StereoMode::TAB) + if (current_stereo_mode == StereoMode::SideBySide || current_stereo_mode == StereoMode::TAB) m_3d_per_eye_resolution->show(); else m_3d_per_eye_resolution->hide(); diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index fd2eb0f6a2..d26b3f0093 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -553,13 +553,13 @@ void HotkeyScheduler::Run() // Stereoscopy if (IsHotkey(HK_TOGGLE_STEREO_SIDE_BY_SIDE)) { - if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::SBS) + if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::SideBySide) { // Disable post-processing shader, as stereoscopy itself is currently a shader if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) == DUBOIS_ALGORITHM_SHADER) Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, ""); - Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::SBS); + Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::SideBySide); } else { diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 804c24eef6..1f7e2aa987 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -1017,7 +1017,7 @@ static bool UseGeometryShaderForPostProcess(bool is_intermediary_buffer) case StereoMode::Anaglyph: case StereoMode::Passive: return is_intermediary_buffer; - case StereoMode::SBS: + case StereoMode::SideBySide: case StereoMode::TAB: case StereoMode::Off: default: diff --git a/Source/Core/VideoCommon/Present.cpp b/Source/Core/VideoCommon/Present.cpp index 4374782464..d74752a2fd 100644 --- a/Source/Core/VideoCommon/Present.cpp +++ b/Source/Core/VideoCommon/Present.cpp @@ -477,7 +477,7 @@ float Presenter::CalculateDrawAspectRatio(bool allow_stretch) const if (g_ActiveConfig.stereo_per_eye_resolution_full) { - if (g_ActiveConfig.stereo_mode == StereoMode::SBS) + if (g_ActiveConfig.stereo_mode == StereoMode::SideBySide) { // Render twice as wide if using side-by-side 3D, since the 3D will halve the horizontal // resolution @@ -830,7 +830,7 @@ void Presenter::RenderXFBToScreen(const MathUtil::Rectangle& target_rc, g_gfx->SelectMainBuffer(); } - else if (g_ActiveConfig.stereo_mode == StereoMode::SBS || + else if (g_ActiveConfig.stereo_mode == StereoMode::SideBySide || g_ActiveConfig.stereo_mode == StereoMode::TAB) { const auto [left_rc, right_rc] = ConvertStereoRectangle(target_rc); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 2d0ab116a1..21d20428d8 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -33,7 +33,7 @@ enum class AspectMode : int enum class StereoMode : int { Off, - SBS, + SideBySide, TAB, Anaglyph, QuadBuffer, From f67d80c7c1e442c058b502477b98bbecd14b4a47 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 23 Apr 2026 12:22:43 -0700 Subject: [PATCH 4/4] VideoConfig: Rename StereoMode::TAB to StereoMode::TopAndBottom --- .../DolphinQt/Config/Graphics/EnhancementsWidget.cpp | 12 ++++++++++-- Source/Core/DolphinQt/HotkeyScheduler.cpp | 4 ++-- Source/Core/VideoCommon/PostProcessing.cpp | 2 +- Source/Core/VideoCommon/Present.cpp | 8 ++++---- Source/Core/VideoCommon/VideoConfig.h | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp index ccbade9da0..228cc348a8 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp @@ -241,8 +241,11 @@ void EnhancementsWidget::CreateWidgets() m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue())); auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE); - if (current_stereo_mode != StereoMode::SideBySide && current_stereo_mode != StereoMode::TAB) + if (current_stereo_mode != StereoMode::SideBySide && + current_stereo_mode != StereoMode::TopAndBottom) + { m_3d_per_eye_resolution->hide(); + } main_layout->addWidget(enhancements_box); main_layout->addWidget(stereoscopy_box); @@ -257,10 +260,15 @@ void EnhancementsWidget::ConnectWidgets() auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE); LoadPostProcessingShaders(); - if (current_stereo_mode == StereoMode::SideBySide || current_stereo_mode == StereoMode::TAB) + if (current_stereo_mode == StereoMode::SideBySide || + current_stereo_mode == StereoMode::TopAndBottom) + { m_3d_per_eye_resolution->show(); + } else + { m_3d_per_eye_resolution->hide(); + } }); connect(m_post_processing_effect, &QComboBox::currentIndexChanged, this, diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index d26b3f0093..8e4f5261dc 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -569,13 +569,13 @@ void HotkeyScheduler::Run() if (IsHotkey(HK_TOGGLE_STEREO_TOP_AND_BOTTOM)) { - if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::TAB) + if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::TopAndBottom) { // Disable post-processing shader, as stereoscopy itself is currently a shader if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) == DUBOIS_ALGORITHM_SHADER) Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, ""); - Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::TAB); + Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::TopAndBottom); } else { diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 1f7e2aa987..92f7c1f99c 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -1018,7 +1018,7 @@ static bool UseGeometryShaderForPostProcess(bool is_intermediary_buffer) case StereoMode::Passive: return is_intermediary_buffer; case StereoMode::SideBySide: - case StereoMode::TAB: + case StereoMode::TopAndBottom: case StereoMode::Off: default: return false; diff --git a/Source/Core/VideoCommon/Present.cpp b/Source/Core/VideoCommon/Present.cpp index d74752a2fd..0691323c54 100644 --- a/Source/Core/VideoCommon/Present.cpp +++ b/Source/Core/VideoCommon/Present.cpp @@ -392,7 +392,7 @@ Presenter::ConvertStereoRectangle(const MathUtil::Rectangle& rc) const { // Resize target to half its original size auto draw_rc = rc; - if (g_ActiveConfig.stereo_mode == StereoMode::TAB) + if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom) { // The height may be negative due to flipped rectangles int height = rc.bottom - rc.top; @@ -409,7 +409,7 @@ Presenter::ConvertStereoRectangle(const MathUtil::Rectangle& rc) const // Create two target rectangle offset to the sides of the backbuffer auto left_rc = draw_rc; auto right_rc = draw_rc; - if (g_ActiveConfig.stereo_mode == StereoMode::TAB) + if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom) { left_rc.top -= m_backbuffer_height / 4; left_rc.bottom -= m_backbuffer_height / 4; @@ -483,7 +483,7 @@ float Presenter::CalculateDrawAspectRatio(bool allow_stretch) const // resolution resulting_aspect_ratio *= 2.0; } - else if (g_ActiveConfig.stereo_mode == StereoMode::TAB) + else if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom) { // Render twice as tall if using top-and-bottom 3D, since the 3D will halve the vertical // resolution @@ -831,7 +831,7 @@ void Presenter::RenderXFBToScreen(const MathUtil::Rectangle& target_rc, g_gfx->SelectMainBuffer(); } else if (g_ActiveConfig.stereo_mode == StereoMode::SideBySide || - g_ActiveConfig.stereo_mode == StereoMode::TAB) + g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom) { const auto [left_rc, right_rc] = ConvertStereoRectangle(target_rc); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 21d20428d8..eed6a3420e 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -34,7 +34,7 @@ enum class StereoMode : int { Off, SideBySide, - TAB, + TopAndBottom, Anaglyph, QuadBuffer, Passive