summaryrefslogtreecommitdiff
path: root/src/core/frontend/framebuffer_layout.h
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-29 02:14:24 -0400
committerGravatar Lioncash2019-06-03 15:34:31 -0400
commite32bf646cfb4a2b86fe2645c20722d55f0f4f96c (patch)
treeba614091669a3ce0329872f4bae3bb239cd7e81c /src/core/frontend/framebuffer_layout.h
parentyuzu/bootmanager: Default EmuThread's destructor in the cpp file (diff)
downloadyuzu-e32bf646cfb4a2b86fe2645c20722d55f0f4f96c.tar.gz
yuzu-e32bf646cfb4a2b86fe2645c20722d55f0f4f96c.tar.xz
yuzu-e32bf646cfb4a2b86fe2645c20722d55f0f4f96c.zip
yuzu/bootmanager: Treat the resolution factor as a u32
Treating it as a u16 can result in a sign-conversion warning when performing arithmetic with it, as u16 promotes to an int when aritmetic is performed on it, not unsigned int. This also makes the interface more uniform, as the layout interface now operates on u32 across the board.
Diffstat (limited to 'src/core/frontend/framebuffer_layout.h')
-rw-r--r--src/core/frontend/framebuffer_layout.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h
index c2c63d08c..d2370adde 100644
--- a/src/core/frontend/framebuffer_layout.h
+++ b/src/core/frontend/framebuffer_layout.h
@@ -8,15 +8,22 @@
8 8
9namespace Layout { 9namespace Layout {
10 10
11enum ScreenUndocked : unsigned { Width = 1280, Height = 720 }; 11enum ScreenUndocked : u32 {
12enum ScreenDocked : unsigned { WidthDocked = 1920, HeightDocked = 1080 }; 12 Width = 1280,
13 Height = 720,
14};
15
16enum ScreenDocked : u32 {
17 WidthDocked = 1920,
18 HeightDocked = 1080,
19};
13 20
14/// Describes the layout of the window framebuffer 21/// Describes the layout of the window framebuffer
15struct FramebufferLayout { 22struct FramebufferLayout {
16 unsigned width{ScreenUndocked::Width}; 23 u32 width{ScreenUndocked::Width};
17 unsigned height{ScreenUndocked::Height}; 24 u32 height{ScreenUndocked::Height};
18 25
19 Common::Rectangle<unsigned> screen; 26 Common::Rectangle<u32> screen;
20 27
21 /** 28 /**
22 * Returns the ration of pixel size of the screen, compared to the native size of the undocked 29 * Returns the ration of pixel size of the screen, compared to the native size of the undocked
@@ -33,12 +40,12 @@ struct FramebufferLayout {
33 * @param height Window framebuffer height in pixels 40 * @param height Window framebuffer height in pixels
34 * @return Newly created FramebufferLayout object with default screen regions initialized 41 * @return Newly created FramebufferLayout object with default screen regions initialized
35 */ 42 */
36FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height); 43FramebufferLayout DefaultFrameLayout(u32 width, u32 height);
37 44
38/** 45/**
39 * Convenience method to get frame layout by resolution scale 46 * Convenience method to get frame layout by resolution scale
40 * @param res_scale resolution scale factor 47 * @param res_scale resolution scale factor
41 */ 48 */
42FramebufferLayout FrameLayoutFromResolutionScale(u16 res_scale); 49FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale);
43 50
44} // namespace Layout 51} // namespace Layout