diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-11-20 23:48:22 +0100 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-11-20 23:50:24 +0100 |
commit | fe1f06c856b768e9afcc9ba9ab8ef09b7152678c (patch) | |
tree | 898ea044f1a8367a5ef5abd5841267b484774cb8 /src/core/frontend | |
parent | Merge pull request #7294 from vonchenplus/fix_image_update_error_when_width_too_small (diff) | |
download | yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar.gz yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar.bz2 yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar.lz yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar.xz yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.tar.zst yuzu-fe1f06c856b768e9afcc9ba9ab8ef09b7152678c.zip |
Diffstat (limited to 'src/core/frontend')
-rw-r--r-- | src/core/frontend/framebuffer_layout.cpp | 7 | ||||
-rw-r--r-- | src/core/frontend/framebuffer_layout.h | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 4b58b672a..26a5b12aa 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -25,7 +25,12 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) { ASSERT(height > 0); // The drawing code needs at least somewhat valid values for both screens // so just calculate them both even if the other isn't showing. - FramebufferLayout res{width, height, false, {}}; + FramebufferLayout res{ + .width = width, + .height = height, + .screen = {}, + .is_srgb = false, + }; const float window_aspect_ratio = static_cast<float>(height) / static_cast<float>(width); const float emulation_aspect_ratio = EmulationAspectRatio( diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h index 2e36c0163..8e341e4e2 100644 --- a/src/core/frontend/framebuffer_layout.h +++ b/src/core/frontend/framebuffer_layout.h @@ -35,17 +35,8 @@ enum class AspectRatio { struct FramebufferLayout { u32 width{ScreenUndocked::Width}; u32 height{ScreenUndocked::Height}; - bool is_srgb{}; - Common::Rectangle<u32> screen; - - /** - * Returns the ration of pixel size of the screen, compared to the native size of the undocked - * Switch screen. - */ - float GetScalingRatio() const { - return static_cast<float>(screen.GetWidth()) / ScreenUndocked::Width; - } + bool is_srgb{}; }; /** |