diff options
| author | bunnei <bunneidev@gmail.com> | 2021-11-16 18:52:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 18:52:11 -0800 |
| commit | c2c9ca98a7f9c9d6d8b33da32ce4bdf1138b4532 (patch) | |
| tree | cb1df371d288677fcede6a3409eb079e0d278163 /src/video_core/video_core.cpp | |
| parent | 1d8ee7341bbcedd9f3050e5cf3665f08a8e1e949 (diff) | |
| parent | 88936fc84a282605ae79c74514cf9ef1a5de74cd (diff) | |
Merge pull request #7219 from FernandoS27/aristotles-right-testicle
Project A.R.T. Advanced Rendering Techniques
Diffstat (limited to 'src/video_core/video_core.cpp')
| -rw-r--r-- | src/video_core/video_core.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index cae543a511..e852c817e5 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -37,6 +37,8 @@ std::unique_ptr<VideoCore::RendererBase> CreateRenderer( namespace VideoCore { std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Core::System& system) { + Settings::UpdateRescalingInfo(); + const auto nvdec_value = Settings::values.nvdec_emulation.GetValue(); const bool use_nvdec = nvdec_value != Settings::NvdecEmulation::Off; const bool use_async = Settings::values.use_asynchronous_gpu_emulation.GetValue(); @@ -53,11 +55,10 @@ std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Cor } } -u16 GetResolutionScaleFactor(const RendererBase& renderer) { - return static_cast<u16>( - Settings::values.resolution_factor.GetValue() != 0 - ? Settings::values.resolution_factor.GetValue() - : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()); +float GetResolutionScaleFactor(const RendererBase& renderer) { + return Settings::values.resolution_info.active + ? Settings::values.resolution_info.up_factor + : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio(); } } // namespace VideoCore |
