diff options
| author |  bunnei | 2019-01-27 12:49:59 -0500 |
|---|---|---|
| committer |  GitHub | 2019-01-27 12:49:59 -0500 |
| commit | 65f390806425508d25a173cda369a20dddbfd4f8 (patch) | |
| tree | 3316454862cabc09dbfb2a99da5fdafd17dfbf0e /src/video_core | |
| parent | Merge pull request #2059 from FearlessTobi/port-4601 (diff) | |
| parent | video_core: Silent implicit conversion warning (diff) | |
| download | yuzu-65f390806425508d25a173cda369a20dddbfd4f8.tar.gz yuzu-65f390806425508d25a173cda369a20dddbfd4f8.tar.xz yuzu-65f390806425508d25a173cda369a20dddbfd4f8.zip | |
Merge pull request #2058 from ReinUsesLisp/trunc-warning
video_core: Silent implicit conversion warning
Diffstat (limited to 'src/video_core')
| -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 | |||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | u16 GetResolutionScaleFactor(const RendererBase& renderer) { | 18 | u16 GetResolutionScaleFactor(const RendererBase& renderer) { |
| 19 | return !Settings::values.resolution_factor | 19 | return static_cast<u16>( |
| 20 | ? renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio() | 20 | Settings::values.resolution_factor |
| 21 | : Settings::values.resolution_factor; | 21 | ? Settings::values.resolution_factor |
| 22 | : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()); | ||
| 22 | } | 23 | } |
| 23 | 24 | ||
| 24 | } // namespace VideoCore | 25 | } // namespace VideoCore |