Merge pull request #2058 from ReinUsesLisp/trunc-warning
video_core: Silent implicit conversion warning
This commit is contained in:
commit
65f3908064
|
@ -16,9 +16,10 @@ std::unique_ptr<RendererBase> CreateRenderer(Core::Frontend::EmuWindow& emu_wind
|
||||||
}
|
}
|
||||||
|
|
||||||
u16 GetResolutionScaleFactor(const RendererBase& renderer) {
|
u16 GetResolutionScaleFactor(const RendererBase& renderer) {
|
||||||
return !Settings::values.resolution_factor
|
return static_cast<u16>(
|
||||||
? renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()
|
Settings::values.resolution_factor
|
||||||
: Settings::values.resolution_factor;
|
? Settings::values.resolution_factor
|
||||||
|
: renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio());
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace VideoCore
|
} // namespace VideoCore
|
||||||
|
|
Loading…
Reference in a new issue