core: frontend: Add top-bottom stereo rendering option

src/citra_qt/configuration/configure_enhancements.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>440</width>
-    <height>748</height>
+    <height>781</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -239,6 +239,11 @@
             <string>Side by Side</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>Top Bottom</string>
+           </property>
+          </item>
           <item>
            <property name="text">
             <string>Anaglyph</string>

src/common/settings.h

@@ -49,10 +49,11 @@ enum class LayoutOption : u32 {
 enum class StereoRenderOption : u32 {
     Off = 0,
     SideBySide = 1,
-    Anaglyph = 2,
+    TopBottom = 2,
-    Interlaced = 3,
+    Anaglyph = 3,
-    ReverseInterlaced = 4,
+    Interlaced = 4,
-    CardboardVR = 5
+    ReverseInterlaced = 5,
+    CardboardVR = 6
 };
 
 // Which eye to render when 3d is off. 800px wide mode could be added here in the future, when

src/core/frontend/emu_window.cpp

@@ -73,6 +73,13 @@ bool EmuWindow::IsWithinTouchscreen(const Layout::FramebufferLayout& layout, uns
                   framebuffer_x < layout.bottom_screen.right / 2) ||
                  (framebuffer_x >= (layout.bottom_screen.left / 2) + (layout.width / 2) &&
                   framebuffer_x < (layout.bottom_screen.right / 2) + (layout.width / 2))));
+    } else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::TopBottom) {
+        return framebuffer_x >= layout.bottom_screen.left &&
+               framebuffer_x < layout.bottom_screen.right &&
+               ((framebuffer_y >= layout.bottom_screen.top / 2 &&
+                 framebuffer_y < layout.bottom_screen.bottom / 2) ||
+                (framebuffer_y >= (layout.bottom_screen.top / 2) + (layout.height / 2) &&
+                 framebuffer_y < (layout.bottom_screen.bottom / 2) + (layout.height / 2)));
     } else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::CardboardVR) {
         return (framebuffer_y >= layout.bottom_screen.top &&
                 framebuffer_y < layout.bottom_screen.bottom &&
@@ -91,22 +98,35 @@ bool EmuWindow::IsWithinTouchscreen(const Layout::FramebufferLayout& layout, uns
 
 std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const {
     if (new_x >= framebuffer_layout.width / 2) {
-        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide)
+        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
             new_x -= framebuffer_layout.width / 2;
-        else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::CardboardVR)
+        } else if (Settings::values.render_3d.GetValue() ==
+                   Settings::StereoRenderOption::CardboardVR) {
             new_x -=
                 (framebuffer_layout.width / 2) - (framebuffer_layout.cardboard.user_x_shift * 2);
         }
-    if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
+    }
-        new_x = std::max(new_x, framebuffer_layout.bottom_screen.left / 2);
+    if (new_y >= framebuffer_layout.height / 2) {
-        new_x = std::min(new_x, framebuffer_layout.bottom_screen.right / 2 - 1);
+        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::TopBottom) {
-    } else {
+            new_y -= framebuffer_layout.height / 2;
-        new_x = std::max(new_x, framebuffer_layout.bottom_screen.left);
+        }
-        new_x = std::min(new_x, framebuffer_layout.bottom_screen.right - 1);
     }
 
-    new_y = std::max(new_y, framebuffer_layout.bottom_screen.top);
+    if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
-    new_y = std::min(new_y, framebuffer_layout.bottom_screen.bottom - 1);
+        new_x = std::clamp(new_x, framebuffer_layout.bottom_screen.left / 2,
+                           framebuffer_layout.bottom_screen.right / 2 - 1);
+    } else {
+        new_x = std::clamp(new_x, framebuffer_layout.bottom_screen.left,
+                           framebuffer_layout.bottom_screen.right - 1);
+    }
+
+    if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::TopBottom) {
+        new_y = std::clamp(new_y, framebuffer_layout.bottom_screen.top / 2,
+                           framebuffer_layout.bottom_screen.bottom / 2 - 1);
+    } else {
+        new_y = std::clamp(new_y, framebuffer_layout.bottom_screen.top,
+                           framebuffer_layout.bottom_screen.bottom - 1);
+    }
 
     return std::make_tuple(new_x, new_y);
 }
@@ -122,17 +142,25 @@ void EmuWindow::CreateTouchState() {
 }
 
 bool EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
-    if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y))
+    if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) {
         return false;
+    }
 
     if (framebuffer_x >= framebuffer_layout.width / 2) {
-        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide)
+        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
             framebuffer_x -= framebuffer_layout.width / 2;
-        else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::CardboardVR)
+        } else if (Settings::values.render_3d.GetValue() ==
+                   Settings::StereoRenderOption::CardboardVR) {
             framebuffer_x -=
                 (framebuffer_layout.width / 2) - (framebuffer_layout.cardboard.user_x_shift * 2);
         }
-    std::lock_guard guard(touch_state->mutex);
+    }
+    if (framebuffer_y >= framebuffer_layout.height / 2) {
+        if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::TopBottom) {
+            framebuffer_y -= framebuffer_layout.height / 2;
+        }
+    }
+    std::scoped_lock lock{touch_state->mutex};
     if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
         touch_state->touch_x =
             static_cast<float>(framebuffer_x - framebuffer_layout.bottom_screen.left / 2) /
@@ -143,9 +171,17 @@ bool EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
             static_cast<float>(framebuffer_x - framebuffer_layout.bottom_screen.left) /
             (framebuffer_layout.bottom_screen.right - framebuffer_layout.bottom_screen.left);
     }
+
+    if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::TopBottom) {
+        touch_state->touch_y =
+            static_cast<float>(framebuffer_y - framebuffer_layout.bottom_screen.top / 2) /
+            (framebuffer_layout.bottom_screen.bottom / 2 -
+             framebuffer_layout.bottom_screen.top / 2);
+    } else {
         touch_state->touch_y =
             static_cast<float>(framebuffer_y - framebuffer_layout.bottom_screen.top) /
             (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top);
+    }
 
     if (!framebuffer_layout.is_rotated) {
         std::swap(touch_state->touch_x, touch_state->touch_y);
@@ -157,18 +193,20 @@ bool EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
 }
 
 void EmuWindow::TouchReleased() {
-    std::lock_guard guard{touch_state->mutex};
+    std::scoped_lock lock{touch_state->mutex};
     touch_state->touch_pressed = false;
     touch_state->touch_x = 0;
     touch_state->touch_y = 0;
 }
 
 void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
-    if (!touch_state->touch_pressed)
+    if (!touch_state->touch_pressed) {
         return;
+    }
 
-    if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y))
+    if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) {
         std::tie(framebuffer_x, framebuffer_y) = ClipToTouchScreen(framebuffer_x, framebuffer_y);
+    }
 
     TouchPressed(framebuffer_x, framebuffer_y);
 }

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -774,6 +774,15 @@ void RendererOpenGL::DrawTopScreen(const Layout::FramebufferLayout& layout,
                          top_screen_top, top_screen_width / 2, top_screen_height, orientation);
         break;
     }
+    case Settings::StereoRenderOption::TopBottom: {
+        DrawSingleScreen(screen_infos[0], top_screen_left, top_screen_top / 2, top_screen_width,
+                         top_screen_height / 2, orientation);
+        glUniform1i(uniform_layer, 1);
+        DrawSingleScreen(screen_infos[1], top_screen_left,
+                         static_cast<float>((top_screen_top / 2) + (layout.height / 2)),
+                         top_screen_width, top_screen_height / 2, orientation);
+        break;
+    }
     case Settings::StereoRenderOption::CardboardVR: {
         DrawSingleScreen(screen_infos[0], top_screen_left, top_screen_top, top_screen_width,
                          top_screen_height, orientation);
@@ -823,6 +832,15 @@ void RendererOpenGL::DrawBottomScreen(const Layout::FramebufferLayout& layout,
             bottom_screen_top, bottom_screen_width / 2, bottom_screen_height, orientation);
         break;
     }
+    case Settings::StereoRenderOption::TopBottom: {
+        DrawSingleScreen(screen_infos[2], bottom_screen_left, bottom_screen_top / 2,
+                         bottom_screen_width, bottom_screen_height / 2, orientation);
+        glUniform1i(uniform_layer, 1);
+        DrawSingleScreen(screen_infos[2], bottom_screen_left,
+                         static_cast<float>((bottom_screen_top / 2) + (layout.height / 2)),
+                         bottom_screen_width, bottom_screen_height / 2, orientation);
+        break;
+    }
     case Settings::StereoRenderOption::CardboardVR: {
         DrawSingleScreen(screen_infos[2], bottom_screen_left, bottom_screen_top,
                          bottom_screen_width, bottom_screen_height, orientation);