diff options
| author |  Rodrigo Locatti | 2020-03-13 16:44:06 -0300 |
|---|---|---|
| committer |  GitHub | 2020-03-13 16:44:06 -0300 |
| commit | 244fe132199cb3c67dd9e612d2be856895f8a868 (patch) | |
| tree | d0f968d06b2bbc6e378a5a0632cd2d6322fe4e6d /src/core/frontend/framebuffer_layout.cpp | |
| parent | gl_shader_decompiler: Initialize gl_Position on vertex shaders (diff) | |
| parent | Merge pull request #3491 from ReinUsesLisp/polygon-modes (diff) | |
| download | yuzu-244fe132199cb3c67dd9e612d2be856895f8a868.tar.gz yuzu-244fe132199cb3c67dd9e612d2be856895f8a868.tar.xz yuzu-244fe132199cb3c67dd9e612d2be856895f8a868.zip | |
Merge branch 'master' into shader-purge
Diffstat (limited to 'src/core/frontend/framebuffer_layout.cpp')
| -rw-r--r-- | src/core/frontend/framebuffer_layout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 2dc795d56..68a0e0906 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp | |||
| @@ -48,8 +48,8 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) { | |||
| 48 | u32 width, height; | 48 | u32 width, height; |
| 49 | 49 | ||
| 50 | if (Settings::values.use_docked_mode) { | 50 | if (Settings::values.use_docked_mode) { |
| 51 | width = ScreenDocked::WidthDocked * res_scale; | 51 | width = ScreenDocked::Width * res_scale; |
| 52 | height = ScreenDocked::HeightDocked * res_scale; | 52 | height = ScreenDocked::Height * res_scale; |
| 53 | } else { | 53 | } else { |
| 54 | width = ScreenUndocked::Width * res_scale; | 54 | width = ScreenUndocked::Width * res_scale; |
| 55 | height = ScreenUndocked::Height * res_scale; | 55 | height = ScreenUndocked::Height * res_scale; |