summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/citra/config.cpp5
-rw-r--r--src/citra/default_ini.h10
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp5
-rw-r--r--src/citra_qt/bootmanager.cpp4
-rw-r--r--src/citra_qt/config.cpp11
-rw-r--r--src/citra_qt/configure_dialog.cpp1
-rw-r--r--src/citra_qt/configure_graphics.cpp5
-rw-r--r--src/citra_qt/configure_graphics.ui115
-rw-r--r--src/citra_qt/main.cpp8
-rw-r--r--src/citra_qt/main.h1
-rw-r--r--src/common/CMakeLists.txt2
-rw-r--r--src/common/emu_window.cpp68
-rw-r--r--src/common/emu_window.h30
-rw-r--r--src/common/framebuffer_layout.cpp138
-rw-r--r--src/common/framebuffer_layout.h47
-rw-r--r--src/common/math_util.h10
-rw-r--r--src/core/settings.cpp7
-rw-r--r--src/core/settings.h11
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp17
19 files changed, 368 insertions, 127 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 05eabfa3d..fd30bfc85 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -72,6 +72,11 @@ void Config::ReadValues() {
72 Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); 72 Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0);
73 Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0); 73 Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0);
74 74
75 // Layout
76 Settings::values.layout_option =
77 static_cast<Settings::LayoutOption>(sdl2_config->GetInteger("Layout", "layout_option", 0));
78 Settings::values.swap_screen = sdl2_config->GetBoolean("Layout", "swap_screen", false);
79
75 // Audio 80 // Audio
76 Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto"); 81 Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto");
77 Settings::values.enable_audio_stretching = 82 Settings::values.enable_audio_stretching =
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 0b49e0230..b22627a2f 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -63,6 +63,16 @@ use_scaled_resolution =
63# 0 (default): Off, 1: On 63# 0 (default): Off, 1: On
64use_vsync = 64use_vsync =
65 65
66[Layout]
67# Layout for the screen inside the render window.
68# 0 (default): Default Top Bottom Screen, 1: Single Screen Only, 2: Large Screen Small Screen
69layout_option =
70
71# Swaps the prominent screen with the other screen.
72# For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.
73# 0 (default): Top Screen is prominent, 1: Bottom Screen is prominent
74swap_screen =
75
66# The clear color for the renderer. What shows up on the sides of the bottom screen. 76# The clear color for the renderer. What shows up on the sides of the bottom screen.
67# Must be in range of 0.0-1.0. Defaults to 1.0 for all. 77# Must be in range of 0.0-1.0. Defaults to 1.0 for all.
68bg_red = 78bg_red =
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp
index 7df054208..8abe48984 100644
--- a/src/citra/emu_window/emu_window_sdl2.cpp
+++ b/src/citra/emu_window/emu_window_sdl2.cpp
@@ -46,11 +46,8 @@ bool EmuWindow_SDL2::IsOpen() const {
46 46
47void EmuWindow_SDL2::OnResize() { 47void EmuWindow_SDL2::OnResize() {
48 int width, height; 48 int width, height;
49
50 SDL_GetWindowSize(render_window, &width, &height); 49 SDL_GetWindowSize(render_window, &width, &height);
51 50 UpdateCurrentFramebufferLayout(width, height);
52 NotifyFramebufferLayoutChanged(
53 EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height));
54} 51}
55 52
56EmuWindow_SDL2::EmuWindow_SDL2() { 53EmuWindow_SDL2::EmuWindow_SDL2() {
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 0abae86c3..7699ca8d0 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -161,9 +161,7 @@ void GRenderWindow::OnFramebufferSizeChanged() {
161 qreal pixelRatio = windowPixelRatio(); 161 qreal pixelRatio = windowPixelRatio();
162 unsigned width = child->QPaintDevice::width() * pixelRatio; 162 unsigned width = child->QPaintDevice::width() * pixelRatio;
163 unsigned height = child->QPaintDevice::height() * pixelRatio; 163 unsigned height = child->QPaintDevice::height() * pixelRatio;
164 164 UpdateCurrentFramebufferLayout(width, height);
165 NotifyFramebufferLayoutChanged(
166 EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height));
167} 165}
168 166
169void GRenderWindow::BackupGeometry() { 167void GRenderWindow::BackupGeometry() {
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index 0b46ca6bb..3d2312619 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -54,6 +54,12 @@ void Config::ReadValues() {
54 Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat(); 54 Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat();
55 qt_config->endGroup(); 55 qt_config->endGroup();
56 56
57 qt_config->beginGroup("Layout");
58 Settings::values.layout_option =
59 static_cast<Settings::LayoutOption>(qt_config->value("layout_option").toInt());
60 Settings::values.swap_screen = qt_config->value("swap_screen", false).toBool();
61 qt_config->endGroup();
62
57 qt_config->beginGroup("Audio"); 63 qt_config->beginGroup("Audio");
58 Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString(); 64 Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString();
59 Settings::values.enable_audio_stretching = 65 Settings::values.enable_audio_stretching =
@@ -155,6 +161,11 @@ void Config::SaveValues() {
155 qt_config->setValue("bg_blue", (double)Settings::values.bg_blue); 161 qt_config->setValue("bg_blue", (double)Settings::values.bg_blue);
156 qt_config->endGroup(); 162 qt_config->endGroup();
157 163
164 qt_config->beginGroup("Layout");
165 qt_config->setValue("layout_option", static_cast<int>(Settings::values.layout_option));
166 qt_config->setValue("swap_screen", Settings::values.swap_screen);
167 qt_config->endGroup();
168
158 qt_config->beginGroup("Audio"); 169 qt_config->beginGroup("Audio");
159 qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id)); 170 qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id));
160 qt_config->setValue("enable_audio_stretching", Settings::values.enable_audio_stretching); 171 qt_config->setValue("enable_audio_stretching", Settings::values.enable_audio_stretching);
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp
index 446ad04a1..525a7cc4e 100644
--- a/src/citra_qt/configure_dialog.cpp
+++ b/src/citra_qt/configure_dialog.cpp
@@ -23,4 +23,5 @@ void ConfigureDialog::applyConfiguration() {
23 ui->graphicsTab->applyConfiguration(); 23 ui->graphicsTab->applyConfiguration();
24 ui->audioTab->applyConfiguration(); 24 ui->audioTab->applyConfiguration();
25 ui->debugTab->applyConfiguration(); 25 ui->debugTab->applyConfiguration();
26 Settings::Apply();
26} 27}
diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp
index 19c1f75c2..29834e11b 100644
--- a/src/citra_qt/configure_graphics.cpp
+++ b/src/citra_qt/configure_graphics.cpp
@@ -23,6 +23,8 @@ void ConfigureGraphics::setConfiguration() {
23 ui->toggle_shader_jit->setChecked(Settings::values.use_shader_jit); 23 ui->toggle_shader_jit->setChecked(Settings::values.use_shader_jit);
24 ui->toggle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); 24 ui->toggle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution);
25 ui->toggle_vsync->setChecked(Settings::values.use_vsync); 25 ui->toggle_vsync->setChecked(Settings::values.use_vsync);
26 ui->layout_combobox->setCurrentIndex(static_cast<int>(Settings::values.layout_option));
27 ui->swap_screen->setChecked(Settings::values.swap_screen);
26} 28}
27 29
28void ConfigureGraphics::applyConfiguration() { 30void ConfigureGraphics::applyConfiguration() {
@@ -30,5 +32,8 @@ void ConfigureGraphics::applyConfiguration() {
30 Settings::values.use_shader_jit = ui->toggle_shader_jit->isChecked(); 32 Settings::values.use_shader_jit = ui->toggle_shader_jit->isChecked();
31 Settings::values.use_scaled_resolution = ui->toggle_scaled_resolution->isChecked(); 33 Settings::values.use_scaled_resolution = ui->toggle_scaled_resolution->isChecked();
32 Settings::values.use_vsync = ui->toggle_vsync->isChecked(); 34 Settings::values.use_vsync = ui->toggle_vsync->isChecked();
35 Settings::values.layout_option =
36 static_cast<Settings::LayoutOption>(ui->layout_combobox->currentIndex());
37 Settings::values.swap_screen = ui->swap_screen->isChecked();
33 Settings::Apply(); 38 Settings::Apply();
34} 39}
diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui
index da6e19ce1..af16a4292 100644
--- a/src/citra_qt/configure_graphics.ui
+++ b/src/citra_qt/configure_graphics.ui
@@ -22,38 +22,88 @@
22 <string>Graphics</string> 22 <string>Graphics</string>
23 </property> 23 </property>
24 <layout class="QVBoxLayout" name="verticalLayout_2"> 24 <layout class="QVBoxLayout" name="verticalLayout_2">
25 <item> 25 <item>
26 <widget class="QCheckBox" name="toggle_hw_renderer"> 26 <widget class="QCheckBox" name="toggle_hw_renderer">
27 <property name="text"> 27 <property name="text">
28 <string>Enable hardware renderer</string> 28 <string>Enable hardware renderer</string>
29 </property> 29 </property>
30 </widget>
31 </item>
32 <item>
33 <widget class="QCheckBox" name="toggle_shader_jit">
34 <property name="text">
35 <string>Enable shader JIT</string>
36 </property>
37 </widget>
38 </item>
39 <item>
40 <widget class="QCheckBox" name="toggle_scaled_resolution">
41 <property name="text">
42 <string>Enable scaled resolution</string>
43 </property>
44 </widget>
45 </item>
46 <item>
47 <widget class="QCheckBox" name="toggle_vsync">
48 <property name="text">
49 <string>Enable V-Sync</string>
50 </property>
51 </widget>
52 </item>
53 </layout>
54 </widget>
55 </item>
56 </layout>
57 </item>
58 <item>
59 <widget class="QGroupBox" name="groupBox2">
60 <property name="title">
61 <string>Layout</string>
62 </property>
63 <layout class="QHBoxLayout" name="horizontalLayout_3">
64 <item>
65 <layout class="QVBoxLayout" name="verticalLayout_2">
66 <item>
67 <layout class="QHBoxLayout" name="horizontalLayout_3">
68 <item>
69 <widget class="QLabel" name="label1">
70 <property name="text">
71 <string>Screen Layout:</string>
72 </property>
30 </widget> 73 </widget>
31 </item> 74 </item>
32 <item> 75 <item>
33 <widget class="QCheckBox" name="toggle_shader_jit"> 76 <widget class="QComboBox" name="layout_combobox">
77 <item>
34 <property name="text"> 78 <property name="text">
35 <string>Enable shader JIT</string> 79 <string notr="true">Default</string>
36 </property> 80 </property>
37 </widget> 81 </item>
38 </item> 82 <item>
39 <item>
40 <widget class="QCheckBox" name="toggle_scaled_resolution">
41 <property name="text"> 83 <property name="text">
42 <string>Enable scaled resolution</string> 84 <string notr="true">Single Screen</string>
43 </property> 85 </property>
44 </widget> 86 </item>
45 </item> 87 <item>
46 <item>
47 <widget class="QCheckBox" name="toggle_vsync">
48 <property name="text"> 88 <property name="text">
49 <string>Enable V-Sync</string> 89 <string notr="true">Large Screen</string>
50 </property> 90 </property>
91 </item>
51 </widget> 92 </widget>
52 </item> 93 </item>
94 </layout>
95 </item>
96 <item>
97 <widget class="QCheckBox" name="swap_screen">
98 <property name="text">
99 <string>Swap Screens</string>
100 </property>
101 </widget>
102 </item>
53 </layout> 103 </layout>
54 </widget> 104 </item>
55 </item> 105 </layout>
56 </layout> 106 </widget>
57 </item> 107 </item>
58 <item> 108 <item>
59 <spacer name="verticalSpacer"> 109 <spacer name="verticalSpacer">
@@ -71,22 +121,5 @@
71 </layout> 121 </layout>
72 </widget> 122 </widget>
73 <resources/> 123 <resources/>
74 <connections> 124 <connections/>
75 <connection>
76 <sender>toggle_gdbstub</sender>
77 <signal>toggled(bool)</signal>
78 <receiver>gdbport_spinbox</receiver>
79 <slot>setEnabled(bool)</slot>
80 <hints>
81 <hint type="sourcelabel">
82 <x>84</x>
83 <y>157</y>
84 </hint>
85 <hint type="destinationlabel">
86 <x>342</x>
87 <y>158</y>
88 </hint>
89 </hints>
90 </connection>
91 </connections>
92</ui> 125</ui>
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 99cc3f096..0bf9f48d6 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -200,6 +200,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
200 200
201 // Setup hotkeys 201 // Setup hotkeys
202 RegisterHotkey("Main Window", "Load File", QKeySequence::Open); 202 RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
203 RegisterHotkey("Main Window", "Swap Screens", QKeySequence::NextChild);
203 RegisterHotkey("Main Window", "Start Emulation"); 204 RegisterHotkey("Main Window", "Start Emulation");
204 LoadHotkeys(); 205 LoadHotkeys();
205 206
@@ -207,6 +208,8 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
207 SLOT(OnMenuLoadFile())); 208 SLOT(OnMenuLoadFile()));
208 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, 209 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
209 SLOT(OnStartGame())); 210 SLOT(OnStartGame()));
211 connect(GetHotkey("Main Window", "Swap Screens", this), SIGNAL(activated()), this,
212 SLOT(OnSwapScreens()));
210 213
211 std::string window_title = 214 std::string window_title =
212 Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); 215 Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
@@ -554,6 +557,11 @@ void GMainWindow::OnConfigure() {
554 } 557 }
555} 558}
556 559
560void GMainWindow::OnSwapScreens() {
561 Settings::values.swap_screen = !Settings::values.swap_screen;
562 Settings::Apply();
563}
564
557void GMainWindow::OnCreateGraphicsSurfaceViewer() { 565void GMainWindow::OnCreateGraphicsSurfaceViewer() {
558 auto graphicsSurfaceViewerWidget = new GraphicsSurfaceWidget(Pica::g_debug_context, this); 566 auto graphicsSurfaceViewerWidget = new GraphicsSurfaceWidget(Pica::g_debug_context, this);
559 addDockWidget(Qt::RightDockWidgetArea, graphicsSurfaceViewerWidget); 567 addDockWidget(Qt::RightDockWidgetArea, graphicsSurfaceViewerWidget);
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 2cf308d80..82eb90aae 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -105,6 +105,7 @@ private slots:
105 /// Called whenever a user selects the "File->Select Game List Root" menu item 105 /// Called whenever a user selects the "File->Select Game List Root" menu item
106 void OnMenuSelectGameListRoot(); 106 void OnMenuSelectGameListRoot();
107 void OnMenuRecentFile(); 107 void OnMenuRecentFile();
108 void OnSwapScreens();
108 void OnConfigure(); 109 void OnConfigure();
109 void OnDisplayTitleBars(bool); 110 void OnDisplayTitleBars(bool);
110 void ToggleWindowMode(); 111 void ToggleWindowMode();
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index aa6eee2a3..74a271f08 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -5,6 +5,7 @@ set(SRCS
5 break_points.cpp 5 break_points.cpp
6 emu_window.cpp 6 emu_window.cpp
7 file_util.cpp 7 file_util.cpp
8 framebuffer_layout.cpp
8 hash.cpp 9 hash.cpp
9 key_map.cpp 10 key_map.cpp
10 logging/filter.cpp 11 logging/filter.cpp
@@ -35,6 +36,7 @@ set(HEADERS
35 common_types.h 36 common_types.h
36 emu_window.h 37 emu_window.h
37 file_util.h 38 file_util.h
39 framebuffer_layout.h
38 hash.h 40 hash.h
39 key_map.h 41 key_map.h
40 linear_disk_cache.h 42 linear_disk_cache.h
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 122f1c212..e3a9e08e6 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -40,7 +40,7 @@ void EmuWindow::CirclePadUpdated(float x, float y) {
40 * @param framebuffer_y Framebuffer y-coordinate to check 40 * @param framebuffer_y Framebuffer y-coordinate to check
41 * @return True if the coordinates are within the touchpad, otherwise false 41 * @return True if the coordinates are within the touchpad, otherwise false
42 */ 42 */
43static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsigned framebuffer_x, 43static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigned framebuffer_x,
44 unsigned framebuffer_y) { 44 unsigned framebuffer_y) {
45 return ( 45 return (
46 framebuffer_y >= layout.bottom_screen.top && framebuffer_y < layout.bottom_screen.bottom && 46 framebuffer_y >= layout.bottom_screen.top && framebuffer_y < layout.bottom_screen.bottom &&
@@ -89,57 +89,19 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
89 TouchPressed(framebuffer_x, framebuffer_y); 89 TouchPressed(framebuffer_x, framebuffer_y);
90} 90}
91 91
92EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, 92void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) {
93 unsigned height) { 93 Layout::FramebufferLayout layout;
94 // When hiding the widget, the function receives a size of 0 94 switch (Settings::values.layout_option) {
95 if (width == 0) 95 case Settings::LayoutOption::SingleScreen:
96 width = 1; 96 layout = Layout::SingleFrameLayout(width, height, Settings::values.swap_screen);
97 if (height == 0) 97 break;
98 height = 1; 98 case Settings::LayoutOption::LargeScreen:
99 99 layout = Layout::LargeFrameLayout(width, height, Settings::values.swap_screen);
100 EmuWindow::FramebufferLayout res = {width, height, {}, {}}; 100 break;
101 101 case Settings::LayoutOption::Default:
102 float window_aspect_ratio = static_cast<float>(height) / width; 102 default:
103 float emulation_aspect_ratio = 103 layout = Layout::DefaultFrameLayout(width, height, Settings::values.swap_screen);
104 static_cast<float>(VideoCore::kScreenTopHeight * 2) / VideoCore::kScreenTopWidth; 104 break;
105
106 if (window_aspect_ratio > emulation_aspect_ratio) {
107 // Window is narrower than the emulation content => apply borders to the top and bottom
108 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
109
110 res.top_screen.left = 0;
111 res.top_screen.right = res.top_screen.left + width;
112 res.top_screen.top = (height - viewport_height) / 2;
113 res.top_screen.bottom = res.top_screen.top + viewport_height / 2;
114
115 int bottom_width = static_cast<int>(
116 (static_cast<float>(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth) *
117 (res.top_screen.right - res.top_screen.left));
118 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
119
120 res.bottom_screen.left = bottom_border;
121 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
122 res.bottom_screen.top = res.top_screen.bottom;
123 res.bottom_screen.bottom = res.bottom_screen.top + viewport_height / 2;
124 } else {
125 // Otherwise, apply borders to the left and right sides of the window.
126 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
127
128 res.top_screen.left = (width - viewport_width) / 2;
129 res.top_screen.right = res.top_screen.left + viewport_width;
130 res.top_screen.top = 0;
131 res.top_screen.bottom = res.top_screen.top + height / 2;
132
133 int bottom_width = static_cast<int>(
134 (static_cast<float>(VideoCore::kScreenBottomWidth) / VideoCore::kScreenTopWidth) *
135 (res.top_screen.right - res.top_screen.left));
136 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
137
138 res.bottom_screen.left = res.top_screen.left + bottom_border;
139 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
140 res.bottom_screen.top = res.top_screen.bottom;
141 res.bottom_screen.bottom = res.bottom_screen.top + height / 2;
142 } 105 }
143 106 NotifyFramebufferLayoutChanged(layout);
144 return res;
145} 107}
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 67df63e06..835c4d500 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -7,6 +7,7 @@
7#include <tuple> 7#include <tuple>
8#include <utility> 8#include <utility>
9#include "common/common_types.h" 9#include "common/common_types.h"
10#include "common/framebuffer_layout.h"
10#include "common/math_util.h" 11#include "common/math_util.h"
11#include "core/hle/service/hid/hid.h" 12#include "core/hle/service/hid/hid.h"
12 13
@@ -38,23 +39,6 @@ public:
38 std::pair<unsigned, unsigned> min_client_area_size; 39 std::pair<unsigned, unsigned> min_client_area_size;
39 }; 40 };
40 41
41 /// Describes the layout of the window framebuffer (size and top/bottom screen positions)
42 struct FramebufferLayout {
43
44 /**
45 * Factory method for constructing a default FramebufferLayout
46 * @param width Window framebuffer width in pixels
47 * @param height Window framebuffer height in pixels
48 * @return Newly created FramebufferLayout object with default screen regions initialized
49 */
50 static FramebufferLayout DefaultScreenLayout(unsigned width, unsigned height);
51
52 unsigned width;
53 unsigned height;
54 MathUtil::Rectangle<unsigned> top_screen;
55 MathUtil::Rectangle<unsigned> bottom_screen;
56 };
57
58 /// Swap buffers to display the next frame 42 /// Swap buffers to display the next frame
59 virtual void SwapBuffers() = 0; 43 virtual void SwapBuffers() = 0;
60 44
@@ -211,10 +195,16 @@ public:
211 * Gets the framebuffer layout (width, height, and screen regions) 195 * Gets the framebuffer layout (width, height, and screen regions)
212 * @note This method is thread-safe 196 * @note This method is thread-safe
213 */ 197 */
214 const FramebufferLayout& GetFramebufferLayout() const { 198 const Layout::FramebufferLayout& GetFramebufferLayout() const {
215 return framebuffer_layout; 199 return framebuffer_layout;
216 } 200 }
217 201
202 /**
203 * Convenience method to update the current frame layout
204 * Read from the current settings to determine which layout to use.
205 */
206 void UpdateCurrentFramebufferLayout(unsigned width, unsigned height);
207
218protected: 208protected:
219 EmuWindow() { 209 EmuWindow() {
220 // TODO: Find a better place to set this. 210 // TODO: Find a better place to set this.
@@ -250,7 +240,7 @@ protected:
250 * Update framebuffer layout with the given parameter. 240 * Update framebuffer layout with the given parameter.
251 * @note EmuWindow implementations will usually use this in window resize event handlers. 241 * @note EmuWindow implementations will usually use this in window resize event handlers.
252 */ 242 */
253 void NotifyFramebufferLayoutChanged(const FramebufferLayout& layout) { 243 void NotifyFramebufferLayoutChanged(const Layout::FramebufferLayout& layout) {
254 framebuffer_layout = layout; 244 framebuffer_layout = layout;
255 } 245 }
256 246
@@ -274,7 +264,7 @@ private:
274 // By default, ignore this request and do nothing. 264 // By default, ignore this request and do nothing.
275 } 265 }
276 266
277 FramebufferLayout framebuffer_layout; ///< Current framebuffer layout 267 Layout::FramebufferLayout framebuffer_layout; ///< Current framebuffer layout
278 268
279 unsigned client_area_width; ///< Current client width, should be set by window impl. 269 unsigned client_area_width; ///< Current client width, should be set by window impl.
280 unsigned client_area_height; ///< Current client height, should be set by window impl. 270 unsigned client_area_height; ///< Current client height, should be set by window impl.
diff --git a/src/common/framebuffer_layout.cpp b/src/common/framebuffer_layout.cpp
new file mode 100644
index 000000000..46c008d9c
--- /dev/null
+++ b/src/common/framebuffer_layout.cpp
@@ -0,0 +1,138 @@
1// Copyright 2016 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <cmath>
6
7#include "common/assert.h"
8#include "common/framebuffer_layout.h"
9#include "video_core/video_core.h"
10
11namespace Layout {
12
13static const float TOP_SCREEN_ASPECT_RATIO =
14 static_cast<float>(VideoCore::kScreenTopHeight) / VideoCore::kScreenTopWidth;
15static const float BOT_SCREEN_ASPECT_RATIO =
16 static_cast<float>(VideoCore::kScreenBottomHeight) / VideoCore::kScreenBottomWidth;
17
18// Finds the largest size subrectangle contained in window area that is confined to the aspect ratio
19template <class T>
20static MathUtil::Rectangle<T> maxRectangle(MathUtil::Rectangle<T> window_area,
21 float screen_aspect_ratio) {
22 float scale = std::min(static_cast<float>(window_area.GetWidth()),
23 window_area.GetHeight() / screen_aspect_ratio);
24 return MathUtil::Rectangle<T>{0, 0, static_cast<T>(std::round(scale)),
25 static_cast<T>(std::round(scale * screen_aspect_ratio))};
26}
27
28FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool swapped) {
29 ASSERT(width > 0);
30 ASSERT(height > 0);
31
32 FramebufferLayout res{width, height, true, true, {}, {}};
33 // Default layout gives equal screen sizes to the top and bottom screen
34 MathUtil::Rectangle<unsigned> screen_window_area{0, 0, width, height / 2};
35 MathUtil::Rectangle<unsigned> top_screen =
36 maxRectangle(screen_window_area, TOP_SCREEN_ASPECT_RATIO);
37 MathUtil::Rectangle<unsigned> bot_screen =
38 maxRectangle(screen_window_area, BOT_SCREEN_ASPECT_RATIO);
39
40 float window_aspect_ratio = static_cast<float>(height) / width;
41 // both screens height are taken into account by multiplying by 2
42 float emulation_aspect_ratio = TOP_SCREEN_ASPECT_RATIO * 2;
43
44 if (window_aspect_ratio < emulation_aspect_ratio) {
45 // Apply borders to the left and right sides of the window.
46 top_screen =
47 top_screen.TranslateX((screen_window_area.GetWidth() - top_screen.GetWidth()) / 2);
48 bot_screen =
49 bot_screen.TranslateX((screen_window_area.GetWidth() - bot_screen.GetWidth()) / 2);
50 } else {
51 // Window is narrower than the emulation content => apply borders to the top and bottom
52 // Recalculate the bottom screen to account for the width difference between top and bottom
53 screen_window_area = {0, 0, width, top_screen.GetHeight()};
54 bot_screen = maxRectangle(screen_window_area, BOT_SCREEN_ASPECT_RATIO);
55 bot_screen = bot_screen.TranslateX((top_screen.GetWidth() - bot_screen.GetWidth()) / 2);
56 if (swapped) {
57 bot_screen = bot_screen.TranslateY(height / 2 - bot_screen.GetHeight());
58 } else {
59 top_screen = top_screen.TranslateY(height / 2 - top_screen.GetHeight());
60 }
61 }
62 // Move the top screen to the bottom if we are swapped.
63 res.top_screen = swapped ? top_screen.TranslateY(height / 2) : top_screen;
64 res.bottom_screen = swapped ? bot_screen : bot_screen.TranslateY(height / 2);
65 return res;
66}
67
68FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool swapped) {
69 ASSERT(width > 0);
70 ASSERT(height > 0);
71 // The drawing code needs at least somewhat valid values for both screens
72 // so just calculate them both even if the other isn't showing.
73 FramebufferLayout res{width, height, !swapped, swapped, {}, {}};
74
75 MathUtil::Rectangle<unsigned> screen_window_area{0, 0, width, height};
76 MathUtil::Rectangle<unsigned> top_screen =
77 maxRectangle(screen_window_area, TOP_SCREEN_ASPECT_RATIO);
78 MathUtil::Rectangle<unsigned> bot_screen =
79 maxRectangle(screen_window_area, BOT_SCREEN_ASPECT_RATIO);
80
81 float window_aspect_ratio = static_cast<float>(height) / width;
82 float emulation_aspect_ratio = (swapped) ? BOT_SCREEN_ASPECT_RATIO : TOP_SCREEN_ASPECT_RATIO;
83
84 if (window_aspect_ratio < emulation_aspect_ratio) {
85 top_screen =
86 top_screen.TranslateX((screen_window_area.GetWidth() - top_screen.GetWidth()) / 2);
87 bot_screen =
88 bot_screen.TranslateX((screen_window_area.GetWidth() - bot_screen.GetWidth()) / 2);
89 } else {
90 top_screen = top_screen.TranslateY((height - top_screen.GetHeight()) / 2);
91 bot_screen = bot_screen.TranslateY((height - bot_screen.GetHeight()) / 2);
92 }
93 res.top_screen = top_screen;
94 res.bottom_screen = bot_screen;
95 return res;
96}
97
98FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool swapped) {
99 ASSERT(width > 0);
100 ASSERT(height > 0);
101
102 FramebufferLayout res{width, height, true, true, {}, {}};
103 // Split the window into two parts. Give 4x width to the main screen and 1x width to the small
104 // To do that, find the total emulation box and maximize that based on window size
105 float window_aspect_ratio = static_cast<float>(height) / width;
106 float emulation_aspect_ratio =
107 swapped
108 ? VideoCore::kScreenBottomHeight * 4 /
109 (VideoCore::kScreenBottomWidth * 4.0f + VideoCore::kScreenTopWidth)
110 : VideoCore::kScreenTopHeight * 4 /
111 (VideoCore::kScreenTopWidth * 4.0f + VideoCore::kScreenBottomWidth);
112 float large_screen_aspect_ratio = swapped ? BOT_SCREEN_ASPECT_RATIO : TOP_SCREEN_ASPECT_RATIO;
113 float small_screen_aspect_ratio = swapped ? TOP_SCREEN_ASPECT_RATIO : BOT_SCREEN_ASPECT_RATIO;
114
115 MathUtil::Rectangle<unsigned> screen_window_area{0, 0, width, height};
116 MathUtil::Rectangle<unsigned> total_rect =
117 maxRectangle(screen_window_area, emulation_aspect_ratio);
118 MathUtil::Rectangle<unsigned> large_screen =
119 maxRectangle(total_rect, large_screen_aspect_ratio);
120 MathUtil::Rectangle<unsigned> fourth_size_rect = total_rect.Scale(.25f);
121 MathUtil::Rectangle<unsigned> small_screen =
122 maxRectangle(fourth_size_rect, small_screen_aspect_ratio);
123
124 if (window_aspect_ratio < emulation_aspect_ratio) {
125 large_screen =
126 large_screen.TranslateX((screen_window_area.GetWidth() - total_rect.GetWidth()) / 2);
127 } else {
128 large_screen = large_screen.TranslateY((height - total_rect.GetHeight()) / 2);
129 }
130 // Shift the small screen to the bottom right corner
131 small_screen =
132 small_screen.TranslateX(large_screen.right)
133 .TranslateY(large_screen.GetHeight() + large_screen.top - small_screen.GetHeight());
134 res.top_screen = swapped ? small_screen : large_screen;
135 res.bottom_screen = swapped ? large_screen : small_screen;
136 return res;
137}
138}
diff --git a/src/common/framebuffer_layout.h b/src/common/framebuffer_layout.h
new file mode 100644
index 000000000..a125646a3
--- /dev/null
+++ b/src/common/framebuffer_layout.h
@@ -0,0 +1,47 @@
1// Copyright 2016 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "common/math_util.h"
8namespace Layout {
9/// Describes the layout of the window framebuffer (size and top/bottom screen positions)
10struct FramebufferLayout {
11 unsigned width;
12 unsigned height;
13 bool top_screen_enabled;
14 bool bottom_screen_enabled;
15 MathUtil::Rectangle<unsigned> top_screen;
16 MathUtil::Rectangle<unsigned> bottom_screen;
17};
18
19/**
20 * Factory method for constructing a default FramebufferLayout
21 * @param width Window framebuffer width in pixels
22 * @param height Window framebuffer height in pixels
23 * @param is_swapped if true, the bottom screen will be displayed above the top screen
24 * @return Newly created FramebufferLayout object with default screen regions initialized
25 */
26FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_swapped);
27
28/**
29 * Factory method for constructing a FramebufferLayout with only the top or bottom screen
30 * @param width Window framebuffer width in pixels
31 * @param height Window framebuffer height in pixels
32 * @param is_swapped if true, the bottom screen will be displayed (and the top won't be displayed)
33 * @return Newly created FramebufferLayout object with default screen regions initialized
34 */
35FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped);
36
37/**
38 * Factory method for constructing a Frame with the a 4x size Top screen with a 1x size bottom
39 * screen on the right
40 * This is useful in particular because it matches well with a 1920x1080 resolution monitor
41 * @param width Window framebuffer width in pixels
42 * @param height Window framebuffer height in pixels
43 * @param is_swapped if true, the bottom screen will be the large display
44 * @return Newly created FramebufferLayout object with default screen regions initialized
45 */
46FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped);
47}
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 41d89666c..cdeaeb733 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -38,6 +38,16 @@ struct Rectangle {
38 T GetHeight() const { 38 T GetHeight() const {
39 return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top)); 39 return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top));
40 } 40 }
41 Rectangle<T> TranslateX(const T x) const {
42 return Rectangle{left + x, top, right + x, bottom};
43 }
44 Rectangle<T> TranslateY(const T y) const {
45 return Rectangle{left, top + y, right, bottom + y};
46 }
47 Rectangle<T> Scale(const float s) const {
48 return Rectangle{left, top, static_cast<T>(left + GetWidth() * s),
49 static_cast<T>(top + GetHeight() * s)};
50 }
41}; 51};
42 52
43} // namespace MathUtil 53} // namespace MathUtil
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 4a0969b00..05f41f798 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -7,6 +7,8 @@
7#include "settings.h" 7#include "settings.h"
8#include "video_core/video_core.h" 8#include "video_core/video_core.h"
9 9
10#include "common/emu_window.h"
11
10namespace Settings { 12namespace Settings {
11 13
12Values values = {}; 14Values values = {};
@@ -20,6 +22,11 @@ void Apply() {
20 VideoCore::g_shader_jit_enabled = values.use_shader_jit; 22 VideoCore::g_shader_jit_enabled = values.use_shader_jit;
21 VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution; 23 VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution;
22 24
25 if (VideoCore::g_emu_window) {
26 auto layout = VideoCore::g_emu_window->GetFramebufferLayout();
27 VideoCore::g_emu_window->UpdateCurrentFramebufferLayout(layout.width, layout.height);
28 }
29
23 AudioCore::SelectSink(values.sink_id); 30 AudioCore::SelectSink(values.sink_id);
24 AudioCore::EnableStretching(values.enable_audio_stretching); 31 AudioCore::EnableStretching(values.enable_audio_stretching);
25} 32}
diff --git a/src/core/settings.h b/src/core/settings.h
index 5a64f8018..e931953d7 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -10,7 +10,15 @@
10 10
11namespace Settings { 11namespace Settings {
12 12
13enum class LayoutOption {
14 Default,
15 SingleScreen,
16 LargeScreen,
17 Custom,
18};
19
13namespace NativeInput { 20namespace NativeInput {
21
14enum Values { 22enum Values {
15 // directly mapped keys 23 // directly mapped keys
16 A, 24 A,
@@ -84,6 +92,9 @@ struct Values {
84 bool use_scaled_resolution; 92 bool use_scaled_resolution;
85 bool use_vsync; 93 bool use_vsync;
86 94
95 LayoutOption layout_option;
96 bool swap_screen;
97
87 float bg_red; 98 float bg_red;
88 float bg_green; 99 float bg_green;
89 float bg_blue; 100 float bg_blue;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 03a588364..93f0ac105 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -390,6 +390,8 @@ void RendererOpenGL::DrawSingleScreenRotated(const ScreenInfo& screen_info, floa
390 */ 390 */
391void RendererOpenGL::DrawScreens() { 391void RendererOpenGL::DrawScreens() {
392 auto layout = render_window->GetFramebufferLayout(); 392 auto layout = render_window->GetFramebufferLayout();
393 const auto& top_screen = layout.top_screen;
394 const auto& bottom_screen = layout.bottom_screen;
393 395
394 glViewport(0, 0, layout.width, layout.height); 396 glViewport(0, 0, layout.width, layout.height);
395 glClear(GL_COLOR_BUFFER_BIT); 397 glClear(GL_COLOR_BUFFER_BIT);
@@ -403,12 +405,15 @@ void RendererOpenGL::DrawScreens() {
403 glActiveTexture(GL_TEXTURE0); 405 glActiveTexture(GL_TEXTURE0);
404 glUniform1i(uniform_color_texture, 0); 406 glUniform1i(uniform_color_texture, 0);
405 407
406 DrawSingleScreenRotated(screen_infos[0], (float)layout.top_screen.left, 408 if (layout.top_screen_enabled) {
407 (float)layout.top_screen.top, (float)layout.top_screen.GetWidth(), 409 DrawSingleScreenRotated(screen_infos[0], (float)top_screen.left, (float)top_screen.top,
408 (float)layout.top_screen.GetHeight()); 410 (float)top_screen.GetWidth(), (float)top_screen.GetHeight());
409 DrawSingleScreenRotated(screen_infos[1], (float)layout.bottom_screen.left, 411 }
410 (float)layout.bottom_screen.top, (float)layout.bottom_screen.GetWidth(), 412 if (layout.bottom_screen_enabled) {
411 (float)layout.bottom_screen.GetHeight()); 413 DrawSingleScreenRotated(screen_infos[1], (float)bottom_screen.left,
414 (float)bottom_screen.top, (float)bottom_screen.GetWidth(),
415 (float)bottom_screen.GetHeight());
416 }
412 417
413 m_current_frame++; 418 m_current_frame++;
414} 419}
HIC SVNT DRACONES