diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.cpp | 1 | ||||
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.cpp | 10 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.ui | 7 |
6 files changed, 0 insertions, 25 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 44252dd81..416b2d866 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -173,7 +173,6 @@ void RestoreGlobalState() { | |||
| 173 | values.use_assembly_shaders.SetGlobal(true); | 173 | values.use_assembly_shaders.SetGlobal(true); |
| 174 | values.use_asynchronous_shaders.SetGlobal(true); | 174 | values.use_asynchronous_shaders.SetGlobal(true); |
| 175 | values.use_fast_gpu_time.SetGlobal(true); | 175 | values.use_fast_gpu_time.SetGlobal(true); |
| 176 | values.force_30fps_mode.SetGlobal(true); | ||
| 177 | values.bg_red.SetGlobal(true); | 176 | values.bg_red.SetGlobal(true); |
| 178 | values.bg_green.SetGlobal(true); | 177 | values.bg_green.SetGlobal(true); |
| 179 | values.bg_blue.SetGlobal(true); | 178 | values.bg_blue.SetGlobal(true); |
diff --git a/src/core/settings.h b/src/core/settings.h index 386233fdf..bb145f193 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -435,7 +435,6 @@ struct Values { | |||
| 435 | Setting<bool> use_vsync; | 435 | Setting<bool> use_vsync; |
| 436 | Setting<bool> use_assembly_shaders; | 436 | Setting<bool> use_assembly_shaders; |
| 437 | Setting<bool> use_asynchronous_shaders; | 437 | Setting<bool> use_asynchronous_shaders; |
| 438 | Setting<bool> force_30fps_mode; | ||
| 439 | Setting<bool> use_fast_gpu_time; | 438 | Setting<bool> use_fast_gpu_time; |
| 440 | 439 | ||
| 441 | Setting<float> bg_red; | 440 | Setting<float> bg_red; |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 59a193edd..94b96afb4 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -666,8 +666,6 @@ void Config::ReadRendererValues() { | |||
| 666 | QStringLiteral("use_asynchronous_shaders"), false); | 666 | QStringLiteral("use_asynchronous_shaders"), false); |
| 667 | ReadSettingGlobal(Settings::values.use_fast_gpu_time, QStringLiteral("use_fast_gpu_time"), | 667 | ReadSettingGlobal(Settings::values.use_fast_gpu_time, QStringLiteral("use_fast_gpu_time"), |
| 668 | true); | 668 | true); |
| 669 | ReadSettingGlobal(Settings::values.force_30fps_mode, QStringLiteral("force_30fps_mode"), false); | ||
| 670 | |||
| 671 | ReadSettingGlobal(Settings::values.bg_red, QStringLiteral("bg_red"), 0.0); | 669 | ReadSettingGlobal(Settings::values.bg_red, QStringLiteral("bg_red"), 0.0); |
| 672 | ReadSettingGlobal(Settings::values.bg_green, QStringLiteral("bg_green"), 0.0); | 670 | ReadSettingGlobal(Settings::values.bg_green, QStringLiteral("bg_green"), 0.0); |
| 673 | ReadSettingGlobal(Settings::values.bg_blue, QStringLiteral("bg_blue"), 0.0); | 671 | ReadSettingGlobal(Settings::values.bg_blue, QStringLiteral("bg_blue"), 0.0); |
| @@ -1153,9 +1151,6 @@ void Config::SaveRendererValues() { | |||
| 1153 | Settings::values.use_asynchronous_shaders, false); | 1151 | Settings::values.use_asynchronous_shaders, false); |
| 1154 | WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time, | 1152 | WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time, |
| 1155 | true); | 1153 | true); |
| 1156 | WriteSettingGlobal(QStringLiteral("force_30fps_mode"), Settings::values.force_30fps_mode, | ||
| 1157 | false); | ||
| 1158 | |||
| 1159 | // Cast to double because Qt's written float values are not human-readable | 1154 | // Cast to double because Qt's written float values are not human-readable |
| 1160 | WriteSettingGlobal(QStringLiteral("bg_red"), Settings::values.bg_red, 0.0); | 1155 | WriteSettingGlobal(QStringLiteral("bg_red"), Settings::values.bg_red, 0.0); |
| 1161 | WriteSettingGlobal(QStringLiteral("bg_green"), Settings::values.bg_green, 0.0); | 1156 | WriteSettingGlobal(QStringLiteral("bg_green"), Settings::values.bg_green, 0.0); |
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 8b9180811..c5d1a778c 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp | |||
| @@ -25,14 +25,12 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { | |||
| 25 | ui->use_vsync->setEnabled(runtime_lock); | 25 | ui->use_vsync->setEnabled(runtime_lock); |
| 26 | ui->use_assembly_shaders->setEnabled(runtime_lock); | 26 | ui->use_assembly_shaders->setEnabled(runtime_lock); |
| 27 | ui->use_asynchronous_shaders->setEnabled(runtime_lock); | 27 | ui->use_asynchronous_shaders->setEnabled(runtime_lock); |
| 28 | ui->force_30fps_mode->setEnabled(runtime_lock); | ||
| 29 | ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); | 28 | ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); |
| 30 | 29 | ||
| 31 | ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue()); | 30 | ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue()); |
| 32 | ui->use_assembly_shaders->setChecked(Settings::values.use_assembly_shaders.GetValue()); | 31 | ui->use_assembly_shaders->setChecked(Settings::values.use_assembly_shaders.GetValue()); |
| 33 | ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); | 32 | ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); |
| 34 | ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); | 33 | ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); |
| 35 | ui->force_30fps_mode->setChecked(Settings::values.force_30fps_mode.GetValue()); | ||
| 36 | 34 | ||
| 37 | if (Settings::configuring_global) { | 35 | if (Settings::configuring_global) { |
| 38 | ui->gpu_accuracy->setCurrentIndex( | 36 | ui->gpu_accuracy->setCurrentIndex( |
| @@ -78,9 +76,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { | |||
| 78 | if (Settings::values.use_fast_gpu_time.UsingGlobal()) { | 76 | if (Settings::values.use_fast_gpu_time.UsingGlobal()) { |
| 79 | Settings::values.use_fast_gpu_time.SetValue(ui->use_fast_gpu_time->isChecked()); | 77 | Settings::values.use_fast_gpu_time.SetValue(ui->use_fast_gpu_time->isChecked()); |
| 80 | } | 78 | } |
| 81 | if (Settings::values.force_30fps_mode.UsingGlobal()) { | ||
| 82 | Settings::values.force_30fps_mode.SetValue(ui->force_30fps_mode->isChecked()); | ||
| 83 | } | ||
| 84 | if (Settings::values.max_anisotropy.UsingGlobal()) { | 79 | if (Settings::values.max_anisotropy.UsingGlobal()) { |
| 85 | Settings::values.max_anisotropy.SetValue( | 80 | Settings::values.max_anisotropy.SetValue( |
| 86 | ui->anisotropic_filtering_combobox->currentIndex()); | 81 | ui->anisotropic_filtering_combobox->currentIndex()); |
| @@ -97,8 +92,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { | |||
| 97 | use_asynchronous_shaders); | 92 | use_asynchronous_shaders); |
| 98 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, | 93 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, |
| 99 | ui->use_fast_gpu_time, use_fast_gpu_time); | 94 | ui->use_fast_gpu_time, use_fast_gpu_time); |
| 100 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode, | ||
| 101 | ui->force_30fps_mode, force_30fps_mode); | ||
| 102 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, | 95 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, |
| 103 | ui->anisotropic_filtering_combobox); | 96 | ui->anisotropic_filtering_combobox); |
| 104 | 97 | ||
| @@ -132,7 +125,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { | |||
| 132 | ui->use_asynchronous_shaders->setEnabled( | 125 | ui->use_asynchronous_shaders->setEnabled( |
| 133 | Settings::values.use_asynchronous_shaders.UsingGlobal()); | 126 | Settings::values.use_asynchronous_shaders.UsingGlobal()); |
| 134 | ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); | 127 | ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); |
| 135 | ui->force_30fps_mode->setEnabled(Settings::values.force_30fps_mode.UsingGlobal()); | ||
| 136 | ui->anisotropic_filtering_combobox->setEnabled( | 128 | ui->anisotropic_filtering_combobox->setEnabled( |
| 137 | Settings::values.max_anisotropy.UsingGlobal()); | 129 | Settings::values.max_anisotropy.UsingGlobal()); |
| 138 | 130 | ||
| @@ -149,8 +141,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { | |||
| 149 | Settings::values.use_asynchronous_shaders, use_asynchronous_shaders); | 141 | Settings::values.use_asynchronous_shaders, use_asynchronous_shaders); |
| 150 | ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, "use_fast_gpu_time", | 142 | ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, "use_fast_gpu_time", |
| 151 | Settings::values.use_fast_gpu_time, use_fast_gpu_time); | 143 | Settings::values.use_fast_gpu_time, use_fast_gpu_time); |
| 152 | ConfigurationShared::SetColoredTristate(ui->force_30fps_mode, "force_30fps_mode", | ||
| 153 | Settings::values.force_30fps_mode, force_30fps_mode); | ||
| 154 | ConfigurationShared::SetColoredComboBox( | 144 | ConfigurationShared::SetColoredComboBox( |
| 155 | ui->gpu_accuracy, ui->label_gpu_accuracy, "label_gpu_accuracy", | 145 | ui->gpu_accuracy, ui->label_gpu_accuracy, "label_gpu_accuracy", |
| 156 | static_cast<int>(Settings::values.gpu_accuracy.GetValue(true))); | 146 | static_cast<int>(Settings::values.gpu_accuracy.GetValue(true))); |
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index 3c4f6f7bb..e61b571c7 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h | |||
| @@ -38,5 +38,4 @@ private: | |||
| 38 | ConfigurationShared::CheckState use_assembly_shaders; | 38 | ConfigurationShared::CheckState use_assembly_shaders; |
| 39 | ConfigurationShared::CheckState use_asynchronous_shaders; | 39 | ConfigurationShared::CheckState use_asynchronous_shaders; |
| 40 | ConfigurationShared::CheckState use_fast_gpu_time; | 40 | ConfigurationShared::CheckState use_fast_gpu_time; |
| 41 | ConfigurationShared::CheckState force_30fps_mode; | ||
| 42 | }; | 41 | }; |
diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index 6a0d29c27..a793c803d 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui | |||
| @@ -97,13 +97,6 @@ | |||
| 97 | </widget> | 97 | </widget> |
| 98 | </item> | 98 | </item> |
| 99 | <item> | 99 | <item> |
| 100 | <widget class="QCheckBox" name="force_30fps_mode"> | ||
| 101 | <property name="text"> | ||
| 102 | <string>Force 30 FPS mode</string> | ||
| 103 | </property> | ||
| 104 | </widget> | ||
| 105 | </item> | ||
| 106 | <item> | ||
| 107 | <widget class="QCheckBox" name="use_fast_gpu_time"> | 100 | <widget class="QCheckBox" name="use_fast_gpu_time"> |
| 108 | <property name="text"> | 101 | <property name="text"> |
| 109 | <string>Use Fast GPU Time</string> | 102 | <string>Use Fast GPU Time</string> |