summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlat9nq <lat9nq@virginia.edu>2020-07-14 03:35:58 +0200
committerlat9nq <lat9nq@virginia.edu>2020-07-19 19:26:55 +0200
commit44b3183ec859062238720d4aaa5d9d50b9a947bd (patch)
tree2822c4287ad5be512a4b9cf357e54a5e17c61828
parentconfigure_audio: fix UI margins (diff)
downloadyuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar.gz
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar.bz2
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar.lz
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar.xz
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.tar.zst
yuzu-44b3183ec859062238720d4aaa5d9d50b9a947bd.zip
-rw-r--r--src/yuzu/configuration/configuration_shared.cpp6
-rw-r--r--src/yuzu/configuration/configuration_shared.h9
2 files changed, 15 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 08d67facd..0c881cf7d 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -124,3 +124,9 @@ void ConfigurationShared::InsertGlobalItem(QComboBox* combobox) {
combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX, use_global_text);
combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX);
}
+
+void ConfigurationShared::InsertGlobalItem(QComboBox* combobox, const QString& global) {
+ const QString use_global_text = ConfigurePerGame::tr("Use global configuration (%1)").arg(global);
+ combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX, use_global_text);
+ combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX);
+}
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index b2bd971c8..4b52834c4 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -27,6 +27,14 @@ struct Trackers {
CheckState use_multi_core;
CheckState enable_audio_stretching;
+
+ CheckState use_disk_shader_cache;
+ CheckState use_asynchronous_gpu_emulation;
+
+ CheckState use_vsync;
+ CheckState use_assembly_shaders;
+ CheckState use_fast_gpu_time;
+ CheckState force_30fps_mode;
} extern trackers;
// Global-aware apply and set functions
@@ -52,5 +60,6 @@ void SetColoredTristate(QCheckBox* checkbox, const std::string& name, const Sett
ConfigurationShared::CheckState& tracker);
void InsertGlobalItem(QComboBox* combobox);
+void InsertGlobalItem(QComboBox* combobox, const QString& global);
} // namespace ConfigurationShared