diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-26 06:22:40 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-26 06:27:14 +0100 |
| commit | fc6d46c374b60e48b8bac8cbcefb587432ae0efd (patch) | |
| tree | 8731c6ad0c0ade3e194026296b9e768f134e9594 /src/video_core/video_core.cpp | |
| parent | Merge pull request #1927 from ReinUsesLisp/shader-ir (diff) | |
| download | yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar.gz yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar.bz2 yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar.lz yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar.xz yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.tar.zst yuzu-fc6d46c374b60e48b8bac8cbcefb587432ae0efd.zip | |
Diffstat (limited to 'src/video_core/video_core.cpp')
| -rw-r--r-- | src/video_core/video_core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index f7de3471b..0b8ccdd44 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -16,9 +16,10 @@ std::unique_ptr<RendererBase> CreateRenderer(Core::Frontend::EmuWindow& emu_wind } u16 GetResolutionScaleFactor(const RendererBase& renderer) { - return !Settings::values.resolution_factor - ? renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio() - : Settings::values.resolution_factor; + return static_cast<u16>( + Settings::values.resolution_factor + ? Settings::values.resolution_factor + : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()); } } // namespace VideoCore |