diff options
| author | 2021-11-21 02:31:32 -0800 | |
|---|---|---|
| committer | 2021-11-21 02:31:32 -0800 | |
| commit | 5082712b4e44ebfe48bd587ea2fa38767b7339cb (patch) | |
| tree | cd2a9393ea5e7d83938baf1f069fc2689e8398af /src/video_core | |
| parent | Merge pull request #7359 from heinermann/kthread_crash (diff) | |
| parent | Fix screenshot dimensions when at 1x scale (diff) | |
| download | yuzu-5082712b4e44ebfe48bd587ea2fa38767b7339cb.tar.gz yuzu-5082712b4e44ebfe48bd587ea2fa38767b7339cb.tar.xz yuzu-5082712b4e44ebfe48bd587ea2fa38767b7339cb.zip | |
Merge pull request #7389 from ameerj/screenshot-1x
Fix screenshot dimensions when at 1x scale
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/video_core.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/video_core.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index e852c817e..329bf4def 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp | |||
| @@ -55,10 +55,4 @@ std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Cor | |||
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | float GetResolutionScaleFactor(const RendererBase& renderer) { | ||
| 59 | return Settings::values.resolution_info.active | ||
| 60 | ? Settings::values.resolution_info.up_factor | ||
| 61 | : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio(); | ||
| 62 | } | ||
| 63 | |||
| 64 | } // namespace VideoCore | 58 | } // namespace VideoCore |
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index f86877e86..084df641f 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h | |||
| @@ -25,6 +25,4 @@ class RendererBase; | |||
| 25 | /// Creates an emulated GPU instance using the given system context. | 25 | /// Creates an emulated GPU instance using the given system context. |
| 26 | std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Core::System& system); | 26 | std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Core::System& system); |
| 27 | 27 | ||
| 28 | float GetResolutionScaleFactor(const RendererBase& renderer); | ||
| 29 | |||
| 30 | } // namespace VideoCore | 28 | } // namespace VideoCore |