summaryrefslogtreecommitdiffstats
path: root/src/core/frontend/framebuffer_layout.cpp
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-02-14 20:39:04 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-02-14 20:39:04 +0100
commitc3d0a0d6277c97d6e3c99914358dce15cc26871c (patch)
tree17d032c03feb8a38938515d5fe9cb9f020d5af01 /src/core/frontend/framebuffer_layout.cpp
parentAddress feedback (diff)
downloadyuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar.gz
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar.bz2
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar.lz
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar.xz
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.tar.zst
yuzu-c3d0a0d6277c97d6e3c99914358dce15cc26871c.zip
Diffstat (limited to '')
-rw-r--r--src/core/frontend/framebuffer_layout.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp
index 1b4f0255e..2dc795d56 100644
--- a/src/core/frontend/framebuffer_layout.cpp
+++ b/src/core/frontend/framebuffer_layout.cpp
@@ -28,8 +28,8 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
FramebufferLayout res{width, height};
const float window_aspect_ratio = static_cast<float>(height) / width;
- float emulation_aspect_ratio = EmulationAspectRatio(
- static_cast<Aspect>(Settings::values.aspect_ratio), window_aspect_ratio);
+ const float emulation_aspect_ratio = EmulationAspectRatio(
+ static_cast<AspectRatio>(Settings::values.aspect_ratio), window_aspect_ratio);
const Common::Rectangle<u32> screen_window_area{0, 0, width, height};
Common::Rectangle<u32> screen = MaxRectangle(screen_window_area, emulation_aspect_ratio);
@@ -58,13 +58,15 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) {
return DefaultFrameLayout(width, height);
}
-float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio) {
+float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio) {
switch (aspect) {
- case Aspect::Default:
+ case AspectRatio::Default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
- case Aspect::Aspect21by9:
+ case AspectRatio::R4_3:
+ return 3.0f / 4.0f;
+ case AspectRatio::R21_9:
return 9.0f / 21.0f;
- case Aspect::StretchToWindow:
+ case AspectRatio::StretchToWindow:
return window_aspect_ratio;
default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;