summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar James Rowe2016-05-03 00:07:17 -0600
committerGravatar James Rowe2016-11-05 02:55:41 -0600
commit2b1654ad9bbd8af53f22434d350704a1a1d0a285 (patch)
tree0da3cc7a1c622c1a659f4b2a8c5c08984dabd5c3 /src/common
parentUpdate CONTRIBUTING.md (diff)
downloadyuzu-2b1654ad9bbd8af53f22434d350704a1a1d0a285.tar.gz
yuzu-2b1654ad9bbd8af53f22434d350704a1a1d0a285.tar.xz
yuzu-2b1654ad9bbd8af53f22434d350704a1a1d0a285.zip
Support additional screen layouts.
Allows users to choose a single screen layout or a large screen layout. Adds a configuration option to change the prominent screen.
Diffstat (limited to 'src/common')
-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.cpp312
-rw-r--r--src/common/framebuffer_layout.h43
5 files changed, 382 insertions, 73 deletions
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..6fac572f5 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 VideoCore EmuWindow
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..a0e75090d
--- /dev/null
+++ b/src/common/framebuffer_layout.cpp
@@ -0,0 +1,312 @@
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 {
12static FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height) {
13
14 ASSERT(width > 0);
15 ASSERT(height > 0);
16
17 FramebufferLayout res {width, height, true, true, {}, {}};
18
19 float window_aspect_ratio = static_cast<float>(height) / width;
20 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenTopHeight * 2) /
21 VideoCore::kScreenTopWidth;
22
23 if (window_aspect_ratio > emulation_aspect_ratio) {
24 // Window is narrower than the emulation content => apply borders to the top and bottom
25 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
26
27 res.top_screen.left = 0;
28 res.top_screen.right = res.top_screen.left + width;
29 res.top_screen.top = (height - viewport_height) / 2;
30 res.top_screen.bottom = res.top_screen.top + viewport_height / 2;
31
32 int bottom_width = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomWidth) /
33 VideoCore::kScreenTopWidth) * (res.top_screen.right - res.top_screen.left));
34 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
35
36 res.bottom_screen.left = bottom_border;
37 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
38 res.bottom_screen.top = res.top_screen.bottom;
39 res.bottom_screen.bottom = res.bottom_screen.top + viewport_height / 2;
40 } else {
41 // Otherwise, apply borders to the left and right sides of the window.
42 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
43
44 res.top_screen.left = (width - viewport_width) / 2;
45 res.top_screen.right = res.top_screen.left + viewport_width;
46 res.top_screen.top = 0;
47 res.top_screen.bottom = res.top_screen.top + height / 2;
48
49 int bottom_width = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomWidth) /
50 VideoCore::kScreenTopWidth) * (res.top_screen.right - res.top_screen.left));
51 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
52
53 res.bottom_screen.left = res.top_screen.left + bottom_border;
54 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
55 res.bottom_screen.top = res.top_screen.bottom;
56 res.bottom_screen.bottom = res.bottom_screen.top + height / 2;
57 }
58
59 return res;
60}
61
62static FramebufferLayout DefaultFrameLayout_Swapped(unsigned width, unsigned height) {
63
64 ASSERT(width > 0);
65 ASSERT(height > 0);
66
67 FramebufferLayout res {width, height, true, true, {}, {}};
68
69 float window_aspect_ratio = static_cast<float>(height) / width;
70 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenTopHeight * 2) /
71 VideoCore::kScreenTopWidth;
72
73 if (window_aspect_ratio > emulation_aspect_ratio) {
74 // Window is narrower than the emulation content => apply borders to the top and bottom
75 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
76
77 res.top_screen.left = 0;
78 res.top_screen.right = res.top_screen.left + width;
79
80 int bottom_width = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomWidth) /
81 VideoCore::kScreenTopWidth) * (res.top_screen.right - res.top_screen.left));
82 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
83
84 res.bottom_screen.left = bottom_border;
85 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
86 res.bottom_screen.top = (height - viewport_height) / 2;
87 res.bottom_screen.bottom = res.bottom_screen.top + viewport_height / 2;
88
89 res.top_screen.top = res.bottom_screen.bottom;
90 res.top_screen.bottom = res.top_screen.top + viewport_height / 2;
91 } else {
92 // Otherwise, apply borders to the left and right sides of the window.
93 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
94 res.top_screen.left = (width - viewport_width) / 2;
95 res.top_screen.right = res.top_screen.left + viewport_width;
96
97 int bottom_width = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomWidth) /
98 VideoCore::kScreenTopWidth) * (res.top_screen.right - res.top_screen.left));
99 int bottom_border = ((res.top_screen.right - res.top_screen.left) - bottom_width) / 2;
100
101 res.bottom_screen.left = res.top_screen.left + bottom_border;
102 res.bottom_screen.right = res.bottom_screen.left + bottom_width;
103 res.bottom_screen.top = 0;
104 res.bottom_screen.bottom = res.bottom_screen.top + height / 2;
105
106 res.top_screen.top = res.bottom_screen.bottom;
107 res.top_screen.bottom = res.top_screen.top + height / 2;
108 }
109
110 return res;
111}
112
113static FramebufferLayout SingleFrameLayout(unsigned width, unsigned height) {
114
115 ASSERT(width > 0);
116 ASSERT(height > 0);
117
118 FramebufferLayout res {width, height, true, false, {}, {}};
119
120 float window_aspect_ratio = static_cast<float>(height) / width;
121 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenTopHeight) /
122 VideoCore::kScreenTopWidth;
123
124 if (window_aspect_ratio > emulation_aspect_ratio) {
125 // Window is narrower than the emulation content => apply borders to the top and bottom
126 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
127
128 res.top_screen.left = 0;
129 res.top_screen.right = res.top_screen.left + width;
130 res.top_screen.top = (height - viewport_height) / 2;
131 res.top_screen.bottom = res.top_screen.top + viewport_height;
132
133 res.bottom_screen.left = 0;
134 res.bottom_screen.right = VideoCore::kScreenBottomWidth;
135 res.bottom_screen.top = 0;
136 res.bottom_screen.bottom = VideoCore::kScreenBottomHeight;
137 } else {
138 // Otherwise, apply borders to the left and right sides of the window.
139 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
140
141 res.top_screen.left = (width - viewport_width) / 2;
142 res.top_screen.right = res.top_screen.left + viewport_width;
143 res.top_screen.top = 0;
144 res.top_screen.bottom = res.top_screen.top + height;
145
146 // The Rasterizer still depends on these fields to maintain the right aspect ratio
147 res.bottom_screen.left = 0;
148 res.bottom_screen.right = VideoCore::kScreenBottomWidth;
149 res.bottom_screen.top = 0;
150 res.bottom_screen.bottom = VideoCore::kScreenBottomHeight;
151 }
152
153 return res;
154}
155
156static FramebufferLayout SingleFrameLayout_Swapped(unsigned width, unsigned height) {
157
158 ASSERT(width > 0);
159 ASSERT(height > 0);
160
161 FramebufferLayout res {width, height, false, true, {}, {}};
162
163 float window_aspect_ratio = static_cast<float>(height) / width;
164 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenBottomHeight) /
165 VideoCore::kScreenBottomWidth;
166
167 if (window_aspect_ratio > emulation_aspect_ratio) {
168 // Window is narrower than the emulation content => apply borders to the top and bottom
169 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
170
171 res.bottom_screen.left = 0;
172 res.bottom_screen.right = res.bottom_screen.left + width;
173 res.bottom_screen.top = (height - viewport_height) / 2;
174 res.bottom_screen.bottom = res.bottom_screen.top + viewport_height;
175
176 // The Rasterizer still depends on these fields to maintain the right aspect ratio
177 res.top_screen.left = 0;
178 res.top_screen.right = VideoCore::kScreenTopWidth;
179 res.top_screen.top = 0;
180 res.top_screen.bottom = VideoCore::kScreenTopHeight;
181 } else {
182 // Otherwise, apply borders to the left and right sides of the window.
183 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
184
185 res.bottom_screen.left = (width - viewport_width) / 2;
186 res.bottom_screen.right = res.bottom_screen.left + viewport_width;
187 res.bottom_screen.top = 0;
188 res.bottom_screen.bottom = res.bottom_screen.top + height;
189
190 res.top_screen.left = 0;
191 res.top_screen.right = VideoCore::kScreenTopWidth;
192 res.top_screen.top = 0;
193 res.top_screen.bottom = VideoCore::kScreenTopHeight;
194 }
195
196 return res;
197}
198
199static FramebufferLayout LargeFrameLayout(unsigned width, unsigned height) {
200
201 ASSERT(width > 0);
202 ASSERT(height > 0);
203
204 FramebufferLayout res {width, height, true, true, {}, {}};
205
206 float window_aspect_ratio = static_cast<float>(height) / width;
207 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenTopHeight * 4) /
208 (VideoCore::kScreenTopWidth * 4 + VideoCore::kScreenBottomWidth);
209
210 if (window_aspect_ratio > emulation_aspect_ratio) {
211 // Window is narrower than the emulation content => apply borders to the top and bottom
212 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
213
214 res.top_screen.left = 0;
215 // Top screen occupies 4 / 5ths of the total width
216 res.top_screen.right = static_cast<int>(std::round(width / 5)) * 4;
217 res.top_screen.top = (height - viewport_height) / 2;
218 res.top_screen.bottom = res.top_screen.top + viewport_height;
219
220 int bottom_height = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomHeight) /
221 VideoCore::kScreenBottomWidth) * (width - res.top_screen.right));
222
223 res.bottom_screen.left = res.top_screen.right;
224 res.bottom_screen.right = width;
225 res.bottom_screen.bottom = res.top_screen.bottom;
226 res.bottom_screen.top = res.bottom_screen.bottom - bottom_height;
227 } else {
228 // Otherwise, apply borders to the left and right sides of the window.
229 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
230 // Break the viewport into fifths and give top 4 of them
231 int fifth_width = static_cast<int>(std::round(viewport_width / 5));
232
233 res.top_screen.left = (width - viewport_width) / 2;
234 res.top_screen.right = res.top_screen.left + fifth_width * 4;
235 res.top_screen.top = 0;
236 res.top_screen.bottom = height;
237
238 int bottom_height = static_cast<int>((static_cast<float>(VideoCore::kScreenBottomHeight) /
239 VideoCore::kScreenBottomWidth) * (fifth_width));
240
241 res.bottom_screen.left = res.top_screen.right;
242 res.bottom_screen.right = width - (width - viewport_width) / 2;
243 res.bottom_screen.bottom = res.top_screen.bottom;
244 res.bottom_screen.top = res.bottom_screen.bottom - bottom_height;
245 }
246
247 return res;
248}
249
250static FramebufferLayout LargeFrameLayout_Swapped(unsigned width, unsigned height) {
251
252 ASSERT(width > 0);
253 ASSERT(height > 0);
254
255 FramebufferLayout res {width, height, true, true, {}, {}};
256
257 float window_aspect_ratio = static_cast<float>(height) / width;
258 float emulation_aspect_ratio = static_cast<float>(VideoCore::kScreenBottomHeight * 4) /
259 (VideoCore::kScreenBottomWidth * 4 + VideoCore::kScreenTopWidth);
260
261 if (window_aspect_ratio > emulation_aspect_ratio) {
262 // Window is narrower than the emulation content => apply borders to the top and bottom
263 int viewport_height = static_cast<int>(std::round(emulation_aspect_ratio * width));
264
265 res.bottom_screen.left = 0;
266 // Top screen occupies 4 / 5ths of the total width
267 res.bottom_screen.right = static_cast<int>(std::round(width / 5)) * 4;
268 res.bottom_screen.top = (height - viewport_height) / 2;
269 res.bottom_screen.bottom = res.bottom_screen.top + viewport_height;
270
271 int top_height = static_cast<int>((static_cast<float>(VideoCore::kScreenTopHeight) /
272 VideoCore::kScreenTopWidth) * (width - res.bottom_screen.right));
273
274 res.top_screen.left = res.bottom_screen.right;
275 res.top_screen.right = width;
276 res.top_screen.bottom = res.bottom_screen.bottom;
277 res.top_screen.top = res.top_screen.bottom - top_height;
278 } else {
279 // Otherwise, apply borders to the left and right sides of the window.
280 int viewport_width = static_cast<int>(std::round(height / emulation_aspect_ratio));
281 // Break the viewport into fifths and give top 4 of them
282 int fifth_width = static_cast<int>(std::round(viewport_width / 5));
283
284 res.bottom_screen.left = (width - viewport_width) / 2;
285 res.bottom_screen.right = res.bottom_screen.left + fifth_width * 4;
286 res.bottom_screen.top = 0;
287 res.bottom_screen.bottom = height;
288
289 int top_height = static_cast<int>((static_cast<float>(VideoCore::kScreenTopHeight) /
290 VideoCore::kScreenTopWidth) * (fifth_width));
291
292 res.top_screen.left = res.bottom_screen.right;
293 res.top_screen.right = width - (width - viewport_width) / 2;
294 res.top_screen.bottom = res.bottom_screen.bottom;
295 res.top_screen.top = res.top_screen.bottom - top_height;
296 }
297
298 return res;
299}
300
301FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_swapped) {
302 return is_swapped ? DefaultFrameLayout_Swapped(width, height) : DefaultFrameLayout(width, height);
303}
304
305FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped) {
306 return is_swapped ? SingleFrameLayout_Swapped(width, height) : SingleFrameLayout(width, height);
307}
308
309FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped) {
310 return is_swapped ? LargeFrameLayout_Swapped(width, height) : LargeFrameLayout(width, height);
311}
312} \ No newline at end of file
diff --git a/src/common/framebuffer_layout.h b/src/common/framebuffer_layout.h
new file mode 100644
index 000000000..c69a80732
--- /dev/null
+++ b/src/common/framebuffer_layout.h
@@ -0,0 +1,43 @@
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 * @return Newly created FramebufferLayout object with default screen regions initialized
24 */
25FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_swapped);
26
27/**
28 * Factory method for constructing a FramebufferLayout with only the top screen
29 * @param width Window framebuffer width in pixels
30 * @param height Window framebuffer height in pixels
31 * @return Newly created FramebufferLayout object with default screen regions initialized
32 */
33FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped);
34
35/**
36 * Factory method for constructing a Frame with the a 4x size Top screen with a 1x size bottom screen on the right
37 * This is useful in particular because it matches well with a 1920x1080 resolution monitor
38 * @param width Window framebuffer width in pixels
39 * @param height Window framebuffer height in pixels
40 * @return Newly created FramebufferLayout object with default screen regions initialized
41 */
42FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped);
43} \ No newline at end of file