Browse Source
Merge pull request #2058 from ReinUsesLisp/trunc-warning
video_core: Silent implicit conversion warning
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
3 deletions
-
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
|
