Browse Source

Merge pull request #2058 from ReinUsesLisp/trunc-warning

video_core: Silent implicit conversion warning
nce_cpp
bunnei 7 years ago
committed by GitHub
parent
commit
1e186a8dd5
  1. 7
      src/video_core/video_core.cpp

7
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
Loading…
Cancel
Save