summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2021-07-20 18:29:52 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2021-11-16 22:11:27 +0100
commit71ca84d8299f7eb6779e95e808b3ec7f8505354b (patch)
treea837911a9e10aaf6ee4cc5204e929afb55dd1b1a /src/common
parentTexture Cache: More rescaling fixes. (diff)
downloadyuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar.gz
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar.bz2
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar.lz
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar.xz
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.tar.zst
yuzu-71ca84d8299f7eb6779e95e808b3ec7f8505354b.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index dd3a3d456..6f3acee79 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -48,7 +48,6 @@ void LogSettings() {
log_setting("Core_UseMultiCore", values.use_multi_core.GetValue());
log_setting("CPU_Accuracy", values.cpu_accuracy.GetValue());
log_setting("Renderer_UseResolutionScaling", values.resolution_setup.GetValue());
- log_setting("Renderer_UseResolutionFactor", values.resolution_factor.GetValue());
log_setting("Renderer_UseSpeedLimit", values.use_speed_limit.GetValue());
log_setting("Renderer_SpeedLimit", values.speed_limit.GetValue());
log_setting("Renderer_UseDiskShaderCache", values.use_disk_shader_cache.GetValue());
@@ -155,6 +154,7 @@ void UpdateRescalingInfo() {
info.down_factor = static_cast<f32>(1U << info.down_shift) / info.up_scale;
info.size_up = info.up_scale * info.up_scale;
info.size_shift = info.down_shift * 2;
+ info.active = info.up_scale != 1 || info.down_shift != 0;
}
void RestoreGlobalState(bool is_powered_on) {
diff --git a/src/common/settings.h b/src/common/settings.h
index f4df2fc95..2b11984b4 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -69,6 +69,7 @@ struct ResolutionScalingInfo {
f32 down_factor{1.0f};
u32 size_up{1};
u32 size_shift{0};
+ bool active{};
};
/** The BasicSetting class is a simple resource manager. It defines a label and default value
@@ -472,7 +473,6 @@ struct Values {
ResolutionScalingInfo resolution_info{};
Setting<ResolutionSetup> resolution_setup{ResolutionSetup::Res1X, "resolution_setup"};
- Setting<u16> resolution_factor{1, "resolution_factor"};
// *nix platforms may have issues with the borderless windowed fullscreen mode.
// Default to exclusive fullscreen on these platforms for now.
RangedSetting<FullscreenMode> fullscreen_mode{