From 873bc7c2952cd846f31bb4cbb78e0e695dd40e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 11:33:50 +0200 Subject: [PATCH 1/7] Remove from config.cpp --- Core/Config.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 13f1de313e..9bdac17310 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -152,7 +151,7 @@ struct ConfigSetting { default_.i = def; } - ConfigSetting(const char *ini, int *v, int def, std::function transTo, std::function transFrom, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, int def, std::string (*transTo)(int), int (*transFrom)(const std::string &), bool save = true, bool perGame = false) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = nullptr; @@ -220,7 +219,7 @@ struct ConfigSetting { cb_.i = def; } - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::function transTo, std::function transFrom, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = def; @@ -410,8 +409,8 @@ struct ConfigSetting { DefaultCallback cb_; // We only support transform for ints. - std::function translateTo_; - std::function translateFrom_; + std::string (*translateTo_)(int) = nullptr; + int(*translateFrom_)(const std::string &) = nullptr; }; struct ReportedConfigSetting : public ConfigSetting { @@ -422,7 +421,7 @@ struct ReportedConfigSetting : public ConfigSetting { } template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::function transTo, std::function transFrom, bool save = true, bool perGame = false) + ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) : ConfigSetting(ini, v, def, transTo, transFrom, save, perGame) { report_ = true; } From 5a1e9ed8f13c01933c09278ee5b71d8fc11b212a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 11:35:46 +0200 Subject: [PATCH 2/7] Add ConfigSettings.cpp/h --- CMakeLists.txt | 2 ++ Core/ConfigSettings.cpp | 3 +++ Core/ConfigSettings.h | 2 ++ UWP/CoreUWP/CoreUWP.vcxproj | 2 ++ UWP/CoreUWP/CoreUWP.vcxproj.filters | 2 ++ android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 7 files changed, 13 insertions(+) create mode 100644 Core/ConfigSettings.cpp create mode 100644 Core/ConfigSettings.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d39083252a..fba3771033 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1740,6 +1740,8 @@ add_library(${CoreLibName} ${CoreLinkType} ${CommonJIT} Core/Config.cpp Core/Config.h + Core/ConfigSettings.cpp + Core/ConfigSettings.h Core/ConfigValues.h Core/ControlMapper.cpp Core/ControlMapper.h diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp new file mode 100644 index 0000000000..9410dbfd9d --- /dev/null +++ b/Core/ConfigSettings.cpp @@ -0,0 +1,3 @@ +#include "Core/ConfigSettings.h" +#include "Core/ConfigValues.h" + diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h new file mode 100644 index 0000000000..3f59c932d3 --- /dev/null +++ b/Core/ConfigSettings.h @@ -0,0 +1,2 @@ +#pragma once + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 7f8c5d0a64..1eaeaef5b1 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -281,6 +281,7 @@ + @@ -521,6 +522,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index e6d4485bb1..85f5201e01 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -1126,6 +1126,7 @@ MIPS + @@ -1780,6 +1781,7 @@ MIPS + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 08c80409e4..38301fb436 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -440,6 +440,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/Core.cpp \ $(SRC)/Core/Compatibility.cpp \ $(SRC)/Core/Config.cpp \ + $(SRC)/Core/ConfigSettings.cpp \ $(SRC)/Core/CoreTiming.cpp \ $(SRC)/Core/CwCheat.cpp \ $(SRC)/Core/HDRemaster.cpp \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index d0b58dd588..e5d39bc963 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -501,6 +501,7 @@ SOURCES_CXX += \ $(EXTDIR)/jpge/jpge.cpp \ $(COREDIR)/AVIDump.cpp \ $(COREDIR)/Config.cpp \ + $(COREDIR)/ConfigSettings.cpp \ $(COREDIR)/ControlMapper.cpp \ $(COREDIR)/Core.cpp \ $(COREDIR)/WaveFile.cpp \ From 6ac45ddba12a98d2f321c9f072168789d6cebfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 11:44:11 +0200 Subject: [PATCH 3/7] Extract the ConfigSetting implementation into its own file. --- Core/Config.cpp | 349 +------------------------------------- Core/Config.h | 16 -- Core/ConfigSettings.cpp | 144 ++++++++++++++++ Core/ConfigSettings.h | 222 ++++++++++++++++++++++++ Core/ConfigValues.h | 16 ++ Core/Core.vcxproj | 2 + Core/Core.vcxproj.filters | 6 + 7 files changed, 391 insertions(+), 364 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 9bdac17310..1984aa7490 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -48,6 +48,7 @@ #include "Common/GPU/Vulkan/VulkanLoader.h" #include "Common/VR/PPSSPPVR.h" #include "Core/Config.h" +#include "Core/ConfigSettings.h" #include "Core/ConfigValues.h" #include "Core/Loaders.h" #include "Core/KeyMap.h" @@ -79,354 +80,6 @@ static const char *logSectionName = "LogDebug"; static const char *logSectionName = "Log"; #endif -struct ConfigSetting { - enum Type { - TYPE_TERMINATOR, - TYPE_BOOL, - TYPE_INT, - TYPE_UINT32, - TYPE_UINT64, - TYPE_FLOAT, - TYPE_STRING, - TYPE_TOUCH_POS, - TYPE_PATH, - TYPE_CUSTOM_BUTTON - }; - union DefaultValue { - bool b; - int i; - uint32_t u; - uint64_t lu; - float f; - const char *s; - const char *p; // not sure how much point.. - ConfigTouchPos touchPos; - ConfigCustomButton customButton; - }; - union SettingPtr { - bool *b; - int *i; - uint32_t *u; - uint64_t *lu; - float *f; - std::string *s; - Path *p; - ConfigTouchPos *touchPos; - ConfigCustomButton *customButton; - }; - - typedef bool (*BoolDefaultCallback)(); - typedef int (*IntDefaultCallback)(); - typedef uint32_t (*Uint32DefaultCallback)(); - typedef uint64_t (*Uint64DefaultCallback)(); - typedef float (*FloatDefaultCallback)(); - typedef const char *(*StringDefaultCallback)(); - typedef ConfigTouchPos (*TouchPosDefaultCallback)(); - typedef const char *(*PathDefaultCallback)(); - typedef ConfigCustomButton (*CustomButtonDefaultCallback)(); - - union DefaultCallback { - BoolDefaultCallback b; - IntDefaultCallback i; - Uint32DefaultCallback u; - Uint64DefaultCallback lu; - FloatDefaultCallback f; - StringDefaultCallback s; - PathDefaultCallback p; - TouchPosDefaultCallback touchPos; - CustomButtonDefaultCallback customButton; - }; - - ConfigSetting(const char *ini, bool *v, bool def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { - ptr_.b = v; - cb_.b = nullptr; - default_.b = def; - } - - ConfigSetting(const char *ini, int *v, int def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { - ptr_.i = v; - cb_.i = nullptr; - default_.i = def; - } - - ConfigSetting(const char *ini, int *v, int def, std::string (*transTo)(int), int (*transFrom)(const std::string &), bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { - ptr_.i = v; - cb_.i = nullptr; - default_.i = def; - } - - ConfigSetting(const char *ini, uint32_t *v, uint32_t def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { - ptr_.u = v; - cb_.u = nullptr; - default_.u = def; - } - - ConfigSetting(const char *ini, uint64_t *v, uint64_t def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_UINT64), report_(false), save_(save), perGame_(perGame) { - ptr_.lu = v; - cb_.lu = nullptr; - default_.lu = def; - } - - ConfigSetting(const char *ini, float *v, float def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { - ptr_.f = v; - cb_.f = nullptr; - default_.f = def; - } - - ConfigSetting(const char *ini, std::string *v, const char *def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { - ptr_.s = v; - cb_.s = nullptr; - default_.s = def; - } - - ConfigSetting(const char *ini, Path *p, const char *def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_PATH), report_(false), save_(save), perGame_(perGame) { - ptr_.p = p; - cb_.p = nullptr; - default_.p = def; - } - - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, bool save = true, bool perGame = false) - : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { - ptr_.touchPos = v; - cb_.touchPos = nullptr; - default_.touchPos = def; - } - - ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, bool save = true, bool perGame = false) - : iniKey_(iniKey), ini2_(iniImage), ini3_(iniShape), ini4_(iniToggle), ini5_(iniRepeat), type_(TYPE_CUSTOM_BUTTON), report_(false), save_(save), perGame_(perGame) { - ptr_.customButton = v; - cb_.customButton = nullptr; - default_.customButton = def; - } - - ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { - ptr_.b = v; - cb_.b = def; - } - - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { - ptr_ .i = v; - cb_.i = def; - } - - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { - ptr_.i = v; - cb_.i = def; - } - - ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { - ptr_ .u = v; - cb_.u = def; - } - - ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { - ptr_.f = v; - cb_.f = def; - } - - ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { - ptr_.s = v; - cb_.s = def; - } - - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, bool save = true, bool perGame = false) - : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { - ptr_.touchPos = v; - cb_.touchPos = def; - } - - // Should actually be called ReadFromIni or something. - bool Get(const Section *section) const { - switch (type_) { - case TYPE_BOOL: - return section->Get(iniKey_, ptr_.b, cb_.b ? cb_.b() : default_.b); - - case TYPE_INT: - if (translateFrom_) { - std::string value; - if (section->Get(iniKey_, &value, nullptr)) { - *ptr_.i = translateFrom_(value); - return true; - } - } - return section->Get(iniKey_, ptr_.i, cb_.i ? cb_.i() : default_.i); - case TYPE_UINT32: - return section->Get(iniKey_, ptr_.u, cb_.u ? cb_.u() : default_.u); - case TYPE_UINT64: - return section->Get(iniKey_, ptr_.lu, cb_.lu ? cb_.lu() : default_.lu); - case TYPE_FLOAT: - return section->Get(iniKey_, ptr_.f, cb_.f ? cb_.f() : default_.f); - case TYPE_STRING: - return section->Get(iniKey_, ptr_.s, cb_.s ? cb_.s() : default_.s); - case TYPE_TOUCH_POS: - { - ConfigTouchPos defaultTouchPos = cb_.touchPos ? cb_.touchPos() : default_.touchPos; - section->Get(iniKey_, &ptr_.touchPos->x, defaultTouchPos.x); - section->Get(ini2_, &ptr_.touchPos->y, defaultTouchPos.y); - section->Get(ini3_, &ptr_.touchPos->scale, defaultTouchPos.scale); - if (ini4_) { - section->Get(ini4_, &ptr_.touchPos->show, defaultTouchPos.show); - } else { - ptr_.touchPos->show = defaultTouchPos.show; - } - return true; - } - case TYPE_PATH: - { - std::string tmp; - bool result = section->Get(iniKey_, &tmp, cb_.p ? cb_.p() : default_.p); - if (result) { - *ptr_.p = Path(tmp); - } - return result; - } - case TYPE_CUSTOM_BUTTON: - { - ConfigCustomButton defaultCustomButton = cb_.customButton ? cb_.customButton() : default_.customButton; - section->Get(iniKey_, &ptr_.customButton->key, defaultCustomButton.key); - section->Get(ini2_, &ptr_.customButton->image, defaultCustomButton.image); - section->Get(ini3_, &ptr_.customButton->shape, defaultCustomButton.shape); - section->Get(ini4_, &ptr_.customButton->toggle, defaultCustomButton.toggle); - section->Get(ini5_, &ptr_.customButton->repeat, defaultCustomButton.repeat); - return true; - } - default: - _dbg_assert_msg_(false, "Get(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); - return false; - } - } - - // Yes, this can be const because what's modified is not the ConfigSetting struct, but the value which is stored elsewhere. - // Should actually be called WriteToIni or something. - void Set(Section *section) const { - if (!save_) { - return; - } - - switch (type_) { - case TYPE_BOOL: - return section->Set(iniKey_, *ptr_.b); - case TYPE_INT: - if (translateTo_) { - std::string value = translateTo_(*ptr_.i); - return section->Set(iniKey_, value); - } - return section->Set(iniKey_, *ptr_.i); - case TYPE_UINT32: - return section->Set(iniKey_, *ptr_.u); - case TYPE_UINT64: - return section->Set(iniKey_, *ptr_.lu); - case TYPE_FLOAT: - return section->Set(iniKey_, *ptr_.f); - case TYPE_STRING: - return section->Set(iniKey_, *ptr_.s); - case TYPE_PATH: - return section->Set(iniKey_, ptr_.p->ToString()); - case TYPE_TOUCH_POS: - section->Set(iniKey_, ptr_.touchPos->x); - section->Set(ini2_, ptr_.touchPos->y); - section->Set(ini3_, ptr_.touchPos->scale); - if (ini4_) { - section->Set(ini4_, ptr_.touchPos->show); - } - return; - case TYPE_CUSTOM_BUTTON: - section->Set(iniKey_, ptr_.customButton->key); - section->Set(ini2_, ptr_.customButton->image); - section->Set(ini3_, ptr_.customButton->shape); - section->Set(ini4_, ptr_.customButton->toggle); - section->Set(ini5_, ptr_.customButton->repeat); - return; - default: - _dbg_assert_msg_(false, "Set(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); - return; - } - } - - void RestoreToDefault() const { - switch (type_) { - case TYPE_BOOL: *ptr_.b = cb_.b ? cb_.b() : default_.b; break; - case TYPE_INT: *ptr_.i = cb_.i ? cb_.i() : default_.i; break; - case TYPE_UINT32: *ptr_.u = cb_.u ? cb_.u() : default_.u; break; - case TYPE_UINT64: *ptr_.lu = cb_.lu ? cb_.lu() : default_.lu; break; - case TYPE_FLOAT: *ptr_.f = cb_.f ? cb_.f() : default_.f; break; - case TYPE_STRING: *ptr_.s = cb_.s ? cb_.s() : default_.s; break; - case TYPE_TOUCH_POS: *ptr_.touchPos = cb_.touchPos ? cb_.touchPos() : default_.touchPos; break; - case TYPE_PATH: *ptr_.p = Path(cb_.p ? cb_.p() : default_.p); break; - case TYPE_CUSTOM_BUTTON: *ptr_.customButton = cb_.customButton ? cb_.customButton() : default_.customButton; break; - default: - _dbg_assert_msg_(false, "RestoreToDefault(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); - } - } - - void Report(UrlEncoder &data, const std::string &prefix) const { - if (!report_) - return; - - switch (type_) { - case TYPE_BOOL: return data.Add(prefix + iniKey_, *ptr_.b); - case TYPE_INT: return data.Add(prefix + iniKey_, *ptr_.i); - case TYPE_UINT32: return data.Add(prefix + iniKey_, *ptr_.u); - case TYPE_UINT64: return data.Add(prefix + iniKey_, *ptr_.lu); - case TYPE_FLOAT: return data.Add(prefix + iniKey_, *ptr_.f); - case TYPE_STRING: return data.Add(prefix + iniKey_, *ptr_.s); - case TYPE_PATH: return data.Add(prefix + iniKey_, ptr_.p->ToString()); - case TYPE_TOUCH_POS: return; // Doesn't report. - case TYPE_CUSTOM_BUTTON: return; // Doesn't report. - default: - _dbg_assert_msg_(false, "Report(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); - return; - } - } - - const char *iniKey_ = nullptr; - const char *ini2_ = nullptr; - const char *ini3_ = nullptr; - const char *ini4_ = nullptr; - const char *ini5_ = nullptr; - - const Type type_; - - bool report_; - const bool save_; - const bool perGame_; - SettingPtr ptr_; - DefaultValue default_{}; - DefaultCallback cb_; - - // We only support transform for ints. - std::string (*translateTo_)(int) = nullptr; - int(*translateFrom_)(const std::string &) = nullptr; -}; - -struct ReportedConfigSetting : public ConfigSetting { - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, bool save = true, bool perGame = false) - : ConfigSetting(ini, v, def, save, perGame) { - report_ = true; - } - - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) - : ConfigSetting(ini, v, def, transTo, transFrom, save, perGame) { - report_ = true; - } -}; - const char *DefaultLangRegion() { // Unfortunate default. There's no need to use bFirstRun, since this is only a default. static std::string defaultLangRegion = "en_US"; diff --git a/Core/Config.h b/Core/Config.h index 7094e0a034..9b0e690bba 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -48,22 +48,6 @@ namespace http { struct UrlEncoder; struct ConfigPrivate; -struct ConfigTouchPos { - float x; - float y; - float scale; - // Note: Show is not used for all settings. - bool show; -}; - -struct ConfigCustomButton { - uint64_t key; - int image; - int shape; - bool toggle; - bool repeat; -}; - struct Config { public: Config(); diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp index 9410dbfd9d..c9812d286f 100644 --- a/Core/ConfigSettings.cpp +++ b/Core/ConfigSettings.cpp @@ -1,3 +1,147 @@ +#include "Common/Data/Format/IniFile.h" +#include "Common/Net/URL.h" +#include "Common/Log.h" + #include "Core/ConfigSettings.h" #include "Core/ConfigValues.h" +bool ConfigSetting::Get(const Section *section) const { + switch (type_) { + case TYPE_BOOL: + return section->Get(iniKey_, ptr_.b, cb_.b ? cb_.b() : default_.b); + + case TYPE_INT: + if (translateFrom_) { + std::string value; + if (section->Get(iniKey_, &value, nullptr)) { + *ptr_.i = translateFrom_(value); + return true; + } + } + return section->Get(iniKey_, ptr_.i, cb_.i ? cb_.i() : default_.i); + case TYPE_UINT32: + return section->Get(iniKey_, ptr_.u, cb_.u ? cb_.u() : default_.u); + case TYPE_UINT64: + return section->Get(iniKey_, ptr_.lu, cb_.lu ? cb_.lu() : default_.lu); + case TYPE_FLOAT: + return section->Get(iniKey_, ptr_.f, cb_.f ? cb_.f() : default_.f); + case TYPE_STRING: + return section->Get(iniKey_, ptr_.s, cb_.s ? cb_.s() : default_.s); + case TYPE_TOUCH_POS: + { + ConfigTouchPos defaultTouchPos = cb_.touchPos ? cb_.touchPos() : default_.touchPos; + section->Get(iniKey_, &ptr_.touchPos->x, defaultTouchPos.x); + section->Get(ini2_, &ptr_.touchPos->y, defaultTouchPos.y); + section->Get(ini3_, &ptr_.touchPos->scale, defaultTouchPos.scale); + if (ini4_) { + section->Get(ini4_, &ptr_.touchPos->show, defaultTouchPos.show); + } else { + ptr_.touchPos->show = defaultTouchPos.show; + } + return true; + } + case TYPE_PATH: + { + std::string tmp; + bool result = section->Get(iniKey_, &tmp, cb_.p ? cb_.p() : default_.p); + if (result) { + *ptr_.p = Path(tmp); + } + return result; + } + case TYPE_CUSTOM_BUTTON: + { + ConfigCustomButton defaultCustomButton = cb_.customButton ? cb_.customButton() : default_.customButton; + section->Get(iniKey_, &ptr_.customButton->key, defaultCustomButton.key); + section->Get(ini2_, &ptr_.customButton->image, defaultCustomButton.image); + section->Get(ini3_, &ptr_.customButton->shape, defaultCustomButton.shape); + section->Get(ini4_, &ptr_.customButton->toggle, defaultCustomButton.toggle); + section->Get(ini5_, &ptr_.customButton->repeat, defaultCustomButton.repeat); + return true; + } + default: + _dbg_assert_msg_(false, "Get(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); + return false; + } +} + +void ConfigSetting::Set(Section *section) const { + if (!save_) { + return; + } + + switch (type_) { + case TYPE_BOOL: + return section->Set(iniKey_, *ptr_.b); + case TYPE_INT: + if (translateTo_) { + std::string value = translateTo_(*ptr_.i); + return section->Set(iniKey_, value); + } + return section->Set(iniKey_, *ptr_.i); + case TYPE_UINT32: + return section->Set(iniKey_, *ptr_.u); + case TYPE_UINT64: + return section->Set(iniKey_, *ptr_.lu); + case TYPE_FLOAT: + return section->Set(iniKey_, *ptr_.f); + case TYPE_STRING: + return section->Set(iniKey_, *ptr_.s); + case TYPE_PATH: + return section->Set(iniKey_, ptr_.p->ToString()); + case TYPE_TOUCH_POS: + section->Set(iniKey_, ptr_.touchPos->x); + section->Set(ini2_, ptr_.touchPos->y); + section->Set(ini3_, ptr_.touchPos->scale); + if (ini4_) { + section->Set(ini4_, ptr_.touchPos->show); + } + return; + case TYPE_CUSTOM_BUTTON: + section->Set(iniKey_, ptr_.customButton->key); + section->Set(ini2_, ptr_.customButton->image); + section->Set(ini3_, ptr_.customButton->shape); + section->Set(ini4_, ptr_.customButton->toggle); + section->Set(ini5_, ptr_.customButton->repeat); + return; + default: + _dbg_assert_msg_(false, "Set(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); + return; + } +} + +void ConfigSetting::RestoreToDefault() const { + switch (type_) { + case TYPE_BOOL: *ptr_.b = cb_.b ? cb_.b() : default_.b; break; + case TYPE_INT: *ptr_.i = cb_.i ? cb_.i() : default_.i; break; + case TYPE_UINT32: *ptr_.u = cb_.u ? cb_.u() : default_.u; break; + case TYPE_UINT64: *ptr_.lu = cb_.lu ? cb_.lu() : default_.lu; break; + case TYPE_FLOAT: *ptr_.f = cb_.f ? cb_.f() : default_.f; break; + case TYPE_STRING: *ptr_.s = cb_.s ? cb_.s() : default_.s; break; + case TYPE_TOUCH_POS: *ptr_.touchPos = cb_.touchPos ? cb_.touchPos() : default_.touchPos; break; + case TYPE_PATH: *ptr_.p = Path(cb_.p ? cb_.p() : default_.p); break; + case TYPE_CUSTOM_BUTTON: *ptr_.customButton = cb_.customButton ? cb_.customButton() : default_.customButton; break; + default: + _dbg_assert_msg_(false, "RestoreToDefault(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); + } +} + +void ConfigSetting::Report(UrlEncoder &data, const std::string &prefix) const { + if (!report_) + return; + + switch (type_) { + case TYPE_BOOL: return data.Add(prefix + iniKey_, *ptr_.b); + case TYPE_INT: return data.Add(prefix + iniKey_, *ptr_.i); + case TYPE_UINT32: return data.Add(prefix + iniKey_, *ptr_.u); + case TYPE_UINT64: return data.Add(prefix + iniKey_, *ptr_.lu); + case TYPE_FLOAT: return data.Add(prefix + iniKey_, *ptr_.f); + case TYPE_STRING: return data.Add(prefix + iniKey_, *ptr_.s); + case TYPE_PATH: return data.Add(prefix + iniKey_, ptr_.p->ToString()); + case TYPE_TOUCH_POS: return; // Doesn't report. + case TYPE_CUSTOM_BUTTON: return; // Doesn't report. + default: + _dbg_assert_msg_(false, "Report(%s): Unexpected ini setting type: %d", iniKey_, (int)type_); + return; + } +} diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h index 3f59c932d3..6f5aa33f7d 100644 --- a/Core/ConfigSettings.h +++ b/Core/ConfigSettings.h @@ -1,2 +1,224 @@ #pragma once +#include + +#include "Core/ConfigValues.h" + +class Path; +class Section; // ini file section +struct UrlEncoder; + +struct ConfigSetting { + enum Type { + TYPE_TERMINATOR, + TYPE_BOOL, + TYPE_INT, + TYPE_UINT32, + TYPE_UINT64, + TYPE_FLOAT, + TYPE_STRING, + TYPE_TOUCH_POS, + TYPE_PATH, + TYPE_CUSTOM_BUTTON + }; + union DefaultValue { + bool b; + int i; + uint32_t u; + uint64_t lu; + float f; + const char *s; + const char *p; // not sure how much point.. + ConfigTouchPos touchPos; + ConfigCustomButton customButton; + }; + union SettingPtr { + bool *b; + int *i; + uint32_t *u; + uint64_t *lu; + float *f; + std::string *s; + Path *p; + ConfigTouchPos *touchPos; + ConfigCustomButton *customButton; + }; + + typedef bool (*BoolDefaultCallback)(); + typedef int (*IntDefaultCallback)(); + typedef uint32_t(*Uint32DefaultCallback)(); + typedef uint64_t(*Uint64DefaultCallback)(); + typedef float (*FloatDefaultCallback)(); + typedef const char *(*StringDefaultCallback)(); + typedef ConfigTouchPos(*TouchPosDefaultCallback)(); + typedef const char *(*PathDefaultCallback)(); + typedef ConfigCustomButton(*CustomButtonDefaultCallback)(); + + union DefaultCallback { + BoolDefaultCallback b; + IntDefaultCallback i; + Uint32DefaultCallback u; + Uint64DefaultCallback lu; + FloatDefaultCallback f; + StringDefaultCallback s; + PathDefaultCallback p; + TouchPosDefaultCallback touchPos; + CustomButtonDefaultCallback customButton; + }; + + ConfigSetting(const char *ini, bool *v, bool def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { + ptr_.b = v; + cb_.b = nullptr; + default_.b = def; + } + + ConfigSetting(const char *ini, int *v, int def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { + ptr_.i = v; + cb_.i = nullptr; + default_.i = def; + } + + ConfigSetting(const char *ini, int *v, int def, std::string(*transTo)(int), int (*transFrom)(const std::string &), bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { + ptr_.i = v; + cb_.i = nullptr; + default_.i = def; + } + + ConfigSetting(const char *ini, uint32_t *v, uint32_t def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { + ptr_.u = v; + cb_.u = nullptr; + default_.u = def; + } + + ConfigSetting(const char *ini, uint64_t *v, uint64_t def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_UINT64), report_(false), save_(save), perGame_(perGame) { + ptr_.lu = v; + cb_.lu = nullptr; + default_.lu = def; + } + + ConfigSetting(const char *ini, float *v, float def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { + ptr_.f = v; + cb_.f = nullptr; + default_.f = def; + } + + ConfigSetting(const char *ini, std::string *v, const char *def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { + ptr_.s = v; + cb_.s = nullptr; + default_.s = def; + } + + ConfigSetting(const char *ini, Path *p, const char *def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_PATH), report_(false), save_(save), perGame_(perGame) { + ptr_.p = p; + cb_.p = nullptr; + default_.p = def; + } + + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, bool save = true, bool perGame = false) + : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { + ptr_.touchPos = v; + cb_.touchPos = nullptr; + default_.touchPos = def; + } + + ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, bool save = true, bool perGame = false) + : iniKey_(iniKey), ini2_(iniImage), ini3_(iniShape), ini4_(iniToggle), ini5_(iniRepeat), type_(TYPE_CUSTOM_BUTTON), report_(false), save_(save), perGame_(perGame) { + ptr_.customButton = v; + cb_.customButton = nullptr; + default_.customButton = def; + } + + ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { + ptr_.b = v; + cb_.b = def; + } + + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { + ptr_.i = v; + cb_.i = def; + } + + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { + ptr_.i = v; + cb_.i = def; + } + + ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { + ptr_.u = v; + cb_.u = def; + } + + ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { + ptr_.f = v; + cb_.f = def; + } + + ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { + ptr_.s = v; + cb_.s = def; + } + + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, bool save = true, bool perGame = false) + : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { + ptr_.touchPos = v; + cb_.touchPos = def; + } + + // Should actually be called ReadFromIni or something. + bool Get(const Section *section) const; + + // Yes, this can be const because what's modified is not the ConfigSetting struct, but the value which is stored elsewhere. + // Should actually be called WriteToIni or something. + void Set(Section *section) const; + + void RestoreToDefault() const; + + void Report(UrlEncoder &data, const std::string &prefix) const; + + const char *iniKey_ = nullptr; + const char *ini2_ = nullptr; + const char *ini3_ = nullptr; + const char *ini4_ = nullptr; + const char *ini5_ = nullptr; + + const Type type_; + + bool report_; + const bool save_; + const bool perGame_; + SettingPtr ptr_; + DefaultValue default_{}; + DefaultCallback cb_; + + // We only support transform for ints. + std::string(*translateTo_)(int) = nullptr; + int(*translateFrom_)(const std::string &) = nullptr; +}; + +struct ReportedConfigSetting : public ConfigSetting { + template + ReportedConfigSetting(const char *ini, T1 *v, T2 def, bool save = true, bool perGame = false) + : ConfigSetting(ini, v, def, save, perGame) { + report_ = true; + } + + template + ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) + : ConfigSetting(ini, v, def, transTo, transFrom, save, perGame) { + report_ = true; + } +}; diff --git a/Core/ConfigValues.h b/Core/ConfigValues.h index 96690ecc5d..300b183e5f 100644 --- a/Core/ConfigValues.h +++ b/Core/ConfigValues.h @@ -31,6 +31,22 @@ const int PSP_DEFAULT_FIRMWARE = 660; static const int8_t VOLUME_OFF = 0; static const int8_t VOLUME_FULL = 10; +struct ConfigTouchPos { + float x; + float y; + float scale; + // Note: Show is not used for all settings. + bool show; +}; + +struct ConfigCustomButton { + uint64_t key; + int image; + int shape; + bool toggle; + bool repeat; +}; + enum class CPUCore { INTERPRETER = 0, JIT = 1, diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 9e534809f2..89454fd9e7 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -540,6 +540,7 @@ + @@ -1110,6 +1111,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 0789b4cdba..cefdfb01cb 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1195,6 +1195,9 @@ MIPS + + Core + @@ -1932,6 +1935,9 @@ MIPS + + Core + From b3d85ae89a3ae02632f6215b2459bbf0bd2c080b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 11:46:44 +0200 Subject: [PATCH 4/7] Prepare for settings move --- Core/Config.cpp | 14 +++++--------- Core/ConfigSettings.h | 6 ++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 1984aa7490..ba3d4ea398 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -814,12 +814,6 @@ static const ConfigSetting vrSettings[] = { ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false), }; -struct ConfigSectionSettings { - const char *section; - const ConfigSetting *settings; - size_t settingsCount; -}; - static const ConfigSectionSettings sections[] = { {"General", generalSettings, ARRAY_SIZE(generalSettings)}, {"CPU", cpuSettings, ARRAY_SIZE(cpuSettings)}, @@ -835,8 +829,10 @@ static const ConfigSectionSettings sections[] = { {"VR", vrSettings, ARRAY_SIZE(vrSettings)}, }; +const size_t numSections = ARRAY_SIZE(sections); + static void IterateSettings(IniFile &iniFile, std::function func) { - for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) { + for (size_t i = 0; i < numSections; ++i) { Section *section = iniFile.GetOrCreateSection(sections[i].section); for (size_t j = 0; j < sections[i].settingsCount; j++) { func(section, sections[i].settings[j]); @@ -845,7 +841,7 @@ static void IterateSettings(IniFile &iniFile, std::function func) { - for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) { + for (size_t i = 0; i < numSections; ++i) { for (size_t j = 0; j < sections[i].settingsCount; j++) { func(sections[i].settings[j]); } @@ -1686,7 +1682,7 @@ void Config::ResetControlLayout() { } void Config::GetReportingInfo(UrlEncoder &data) { - for (size_t i = 0; i < ARRAY_SIZE(sections); ++i) { + for (size_t i = 0; i < numSections; ++i) { const std::string prefix = std::string("config.") + sections[i].section; for (size_t j = 0; j < sections[i].settingsCount; j++) { sections[i].settings[j].Report(data, prefix); diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h index 6f5aa33f7d..7c0456c202 100644 --- a/Core/ConfigSettings.h +++ b/Core/ConfigSettings.h @@ -222,3 +222,9 @@ struct ReportedConfigSetting : public ConfigSetting { report_ = true; } }; + +struct ConfigSectionSettings { + const char *section; + const ConfigSetting *settings; + size_t settingsCount; +}; From b84f723a7fc7cc8cffe1626b05997dca51f40a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 15:48:06 +0200 Subject: [PATCH 5/7] Make the save and per-game flags non-optional --- Core/Config.cpp | 172 +++++++++++++++++++++--------------------- Core/ConfigSettings.h | 38 +++++----- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index ba3d4ea398..cf3d0a7acd 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -159,16 +159,16 @@ static float DefaultUISaturation() { } static const ConfigSetting generalSettings[] = { - ConfigSetting("FirstRun", &g_Config.bFirstRun, true), - ConfigSetting("RunCount", &g_Config.iRunCount, 0), - ConfigSetting("Enable Logging", &g_Config.bEnableLogging, true), - ConfigSetting("AutoRun", &g_Config.bAutoRun, true), - ConfigSetting("Browse", &g_Config.bBrowse, false), - ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), - ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), - ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), - ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true), - ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), + ConfigSetting("FirstRun", &g_Config.bFirstRun, true, true, false), + ConfigSetting("RunCount", &g_Config.iRunCount, 0, true, false), + ConfigSetting("Enable Logging", &g_Config.bEnableLogging, true, true, false), + ConfigSetting("AutoRun", &g_Config.bAutoRun, true, true, false), + ConfigSetting("Browse", &g_Config.bBrowse, false, true, false), + ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true, false), + ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, "", true, false), + ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false, true, false), + ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true, true, false), + ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion, true, false), ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... ConfigSetting("UISound", &g_Config.bUISound, false, true, false), @@ -177,14 +177,14 @@ static const ConfigSetting generalSettings[] = { ReportedConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, true, true), ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshRate, 77, true, true), ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, true, true), - ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f), + ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, true, false), ConfigSetting("ScreenshotsAsPNG", &g_Config.bScreenshotsAsPNG, false, true, true), - ConfigSetting("UseFFV1", &g_Config.bUseFFV1, false), - ConfigSetting("DumpFrames", &g_Config.bDumpFrames, false), - ConfigSetting("DumpVideoOutput", &g_Config.bDumpVideoOutput, false), - ConfigSetting("DumpAudio", &g_Config.bDumpAudio, false), - ConfigSetting("SaveLoadResetsAVdumping", &g_Config.bSaveLoadResetsAVdumping, false), + ConfigSetting("UseFFV1", &g_Config.bUseFFV1, false, true, false), + ConfigSetting("DumpFrames", &g_Config.bDumpFrames, false, true, false), + ConfigSetting("DumpVideoOutput", &g_Config.bDumpVideoOutput, false, true, false), + ConfigSetting("DumpAudio", &g_Config.bDumpAudio, false, true, false), + ConfigSetting("SaveLoadResetsAVdumping", &g_Config.bSaveLoadResetsAVdumping, false, true, false), ConfigSetting("StateSlot", &g_Config.iCurrentStateSlot, 0, true, true), ConfigSetting("EnableStateUndo", &g_Config.bEnableStateUndo, &DefaultEnableStateUndo, true, true), ConfigSetting("StateLoadUndoGame", &g_Config.sStateLoadUndoGame, "NA", true, false), @@ -193,12 +193,12 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("RewindSnapshotInterval", &g_Config.iRewindSnapshotInterval, 0, true, true), ConfigSetting("ShowOnScreenMessage", &g_Config.bShowOnScreenMessages, true, true, false), - ConfigSetting("ShowRegionOnGameIcon", &g_Config.bShowRegionOnGameIcon, false), - ConfigSetting("ShowIDOnGameIcon", &g_Config.bShowIDOnGameIcon, false), - ConfigSetting("GameGridScale", &g_Config.fGameGridScale, 1.0), - ConfigSetting("GridView1", &g_Config.bGridView1, true), - ConfigSetting("GridView2", &g_Config.bGridView2, true), - ConfigSetting("GridView3", &g_Config.bGridView3, false), + ConfigSetting("ShowRegionOnGameIcon", &g_Config.bShowRegionOnGameIcon, false, true, false), + ConfigSetting("ShowIDOnGameIcon", &g_Config.bShowIDOnGameIcon, false, true, false), + ConfigSetting("GameGridScale", &g_Config.fGameGridScale, 1.0, true, false), + ConfigSetting("GridView1", &g_Config.bGridView1, true, true, false), + ConfigSetting("GridView2", &g_Config.bGridView2, true, true, false), + ConfigSetting("GridView3", &g_Config.bGridView3, false, true, false), ConfigSetting("RightAnalogUp", &g_Config.iRightAnalogUp, 0, true, true), ConfigSetting("RightAnalogDown", &g_Config.iRightAnalogDown, 0, true, true), ConfigSetting("RightAnalogLeft", &g_Config.iRightAnalogLeft, 0, true, true), @@ -216,16 +216,16 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("GestureControlEnabled", &g_Config.bGestureControlEnabled, false, true, true), // "default" means let emulator decide, "" means disable. - ConfigSetting("ReportingHost", &g_Config.sReportHost, "default"), + ConfigSetting("ReportingHost", &g_Config.sReportHost, "default", true, false), ConfigSetting("AutoSaveSymbolMap", &g_Config.bAutoSaveSymbolMap, false, true, true), ConfigSetting("CacheFullIsoInRam", &g_Config.bCacheFullIsoInRam, false, true, true), ConfigSetting("RemoteISOPort", &g_Config.iRemoteISOPort, 0, true, false), - ConfigSetting("LastRemoteISOServer", &g_Config.sLastRemoteISOServer, ""), - ConfigSetting("LastRemoteISOPort", &g_Config.iLastRemoteISOPort, 0), - ConfigSetting("RemoteISOManualConfig", &g_Config.bRemoteISOManual, false), - ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false), - ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/"), - ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false), + ConfigSetting("LastRemoteISOServer", &g_Config.sLastRemoteISOServer, "", true, false), + ConfigSetting("LastRemoteISOPort", &g_Config.iLastRemoteISOPort, 0, true, false), + ConfigSetting("RemoteISOManualConfig", &g_Config.bRemoteISOManual, false, true, false), + ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false, true, false), + ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/", true, false), + ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false, true, false), #ifdef __ANDROID__ ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, ROTATION_AUTO_HORIZONTAL), @@ -238,15 +238,15 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("UISaturation", &g_Config.fUISaturation, &DefaultUISaturation, true, false), #if defined(USING_WIN_UI) - ConfigSetting("TopMost", &g_Config.bTopMost, false), + ConfigSetting("TopMost", &g_Config.bTopMost, false, true, false), ConfigSetting("PauseOnLostFocus", &g_Config.bPauseOnLostFocus, false, true, true), #endif #if !defined(MOBILE_DEVICE) - ConfigSetting("WindowX", &g_Config.iWindowX, -1), // -1 tells us to center the window. - ConfigSetting("WindowY", &g_Config.iWindowY, -1), - ConfigSetting("WindowWidth", &g_Config.iWindowWidth, 0), // 0 will be automatically reset later (need to do the AdjustWindowRect dance). - ConfigSetting("WindowHeight", &g_Config.iWindowHeight, 0), + ConfigSetting("WindowX", &g_Config.iWindowX, -1, true, false), // -1 tells us to center the window. + ConfigSetting("WindowY", &g_Config.iWindowY, -1, true, false), + ConfigSetting("WindowWidth", &g_Config.iWindowWidth, 0, true, false), // 0 will be automatically reset later (need to do the AdjustWindowRect dance). + ConfigSetting("WindowHeight", &g_Config.iWindowHeight, 0, true, false), #endif ConfigSetting("PauseWhenMinimized", &g_Config.bPauseWhenMinimized, false, true, true), @@ -475,8 +475,8 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("CardboardYShift", &g_Config.iCardboardYShift, 0, true, true), ConfigSetting("iShowStatusFlags", &g_Config.iShowStatusFlags, 0, true, true), ReportedConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, true, false), - ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, ""), - ConfigSetting("DisabledGraphicsBackends", &g_Config.sDisabledGPUBackends, ""), + ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, "", true, false), + ConfigSetting("DisabledGraphicsBackends", &g_Config.sDisabledGPUBackends, "", true, false), ConfigSetting("VulkanDevice", &g_Config.sVulkanDevice, "", true, false), #ifdef _WIN32 ConfigSetting("D3D11Device", &g_Config.sD3D11Device, "", true, false), @@ -502,7 +502,7 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("AnalogFrameRate", &g_Config.iAnalogFpsLimit, 240, true, true), ConfigSetting("UnthrottlingMode", &g_Config.iFastForwardMode, &DefaultFastForwardMode, &FastForwardModeToString, &FastForwardModeFromString, true, true), #if defined(USING_WIN_UI) - ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false), + ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false, false), #endif // Most low-performance (and many high performance) mobile GPUs do not support aniso anyway so defaulting to 4 is fine. @@ -511,11 +511,11 @@ static const ConfigSetting graphicsSettings[] = { ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, true, true), ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, true, true), - ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false), + ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false, false), #ifndef MOBILE_DEVICE - ConfigSetting("FullScreen", &g_Config.bFullScreen, false), - ConfigSetting("FullScreenMulti", &g_Config.bFullScreenMulti, false), + ConfigSetting("FullScreen", &g_Config.bFullScreen, false, true, false), + ConfigSetting("FullScreenMulti", &g_Config.bFullScreenMulti, false, true, false), #endif ConfigSetting("BufferFiltering", &g_Config.iDisplayFilter, SCALE_LINEAR, true, true), @@ -752,40 +752,40 @@ static const ConfigSetting systemParamSettings[] = { }; static const ConfigSetting debuggerSettings[] = { - ConfigSetting("DisasmWindowX", &g_Config.iDisasmWindowX, -1), - ConfigSetting("DisasmWindowY", &g_Config.iDisasmWindowY, -1), - ConfigSetting("DisasmWindowW", &g_Config.iDisasmWindowW, -1), - ConfigSetting("DisasmWindowH", &g_Config.iDisasmWindowH, -1), - ConfigSetting("GEWindowX", &g_Config.iGEWindowX, -1), - ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1), - ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1), - ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1), - ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0), - ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0), - ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0), - ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1), - ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1), - ConfigSetting("FontWidth", &g_Config.iFontWidth, 8), - ConfigSetting("FontHeight", &g_Config.iFontHeight, 12), - ConfigSetting("DisplayStatusBar", &g_Config.bDisplayStatusBar, true), - ConfigSetting("ShowBottomTabTitles",&g_Config.bShowBottomTabTitles, true), - ConfigSetting("ShowDeveloperMenu", &g_Config.bShowDeveloperMenu, false), - ConfigSetting("ShowAllocatorDebug", &g_Config.bShowAllocatorDebug, false, false), - ConfigSetting("ShowGpuProfile", &g_Config.bShowGpuProfile, false, false), - ConfigSetting("SkipDeadbeefFilling", &g_Config.bSkipDeadbeefFilling, false), - ConfigSetting("FuncHashMap", &g_Config.bFuncHashMap, false), - ConfigSetting("MemInfoDetailed", &g_Config.bDebugMemInfoDetailed, false), - ConfigSetting("DrawFrameGraph", &g_Config.bDrawFrameGraph, false), + ConfigSetting("DisasmWindowX", &g_Config.iDisasmWindowX, -1, true, false), + ConfigSetting("DisasmWindowY", &g_Config.iDisasmWindowY, -1, true, false), + ConfigSetting("DisasmWindowW", &g_Config.iDisasmWindowW, -1, true, false), + ConfigSetting("DisasmWindowH", &g_Config.iDisasmWindowH, -1, true, false), + ConfigSetting("GEWindowX", &g_Config.iGEWindowX, -1, true, false), + ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1, true, false), + ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1, true, false), + ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1, true, false), + ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0, true, false), + ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0, true, false), + ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0, true, false), + ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1, true, false), + ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1, true, false), + ConfigSetting("FontWidth", &g_Config.iFontWidth, 8, true, false), + ConfigSetting("FontHeight", &g_Config.iFontHeight, 12, true, false), + ConfigSetting("DisplayStatusBar", &g_Config.bDisplayStatusBar, true, true, false), + ConfigSetting("ShowBottomTabTitles",&g_Config.bShowBottomTabTitles, true, true, false), + ConfigSetting("ShowDeveloperMenu", &g_Config.bShowDeveloperMenu, false, true, false), + ConfigSetting("ShowAllocatorDebug", &g_Config.bShowAllocatorDebug, false, false, false), + ConfigSetting("ShowGpuProfile", &g_Config.bShowGpuProfile, false, false, false), + ConfigSetting("SkipDeadbeefFilling", &g_Config.bSkipDeadbeefFilling, false, true, false), + ConfigSetting("FuncHashMap", &g_Config.bFuncHashMap, false, true, false), + ConfigSetting("MemInfoDetailed", &g_Config.bDebugMemInfoDetailed, false, true, false), + ConfigSetting("DrawFrameGraph", &g_Config.bDrawFrameGraph, false, true, false), }; static const ConfigSetting jitSettings[] = { - ReportedConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, false), + ReportedConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, false, false), }; static const ConfigSetting upgradeSettings[] = { - ConfigSetting("UpgradeMessage", &g_Config.upgradeMessage, ""), - ConfigSetting("UpgradeVersion", &g_Config.upgradeVersion, ""), - ConfigSetting("DismissedVersion", &g_Config.dismissedVersion, ""), + ConfigSetting("UpgradeMessage", &g_Config.upgradeMessage, "", true, false), + ConfigSetting("UpgradeVersion", &g_Config.upgradeVersion, "", true, false), + ConfigSetting("DismissedVersion", &g_Config.dismissedVersion, "", true, false), }; static const ConfigSetting themeSettings[] = { @@ -794,24 +794,24 @@ static const ConfigSetting themeSettings[] = { static const ConfigSetting vrSettings[] = { - ConfigSetting("VREnable", &g_Config.bEnableVR, true), - ConfigSetting("VREnable6DoF", &g_Config.bEnable6DoF, true), - ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, false), - ConfigSetting("VREnableMotions", &g_Config.bEnableMotions, true), - ConfigSetting("VRForce72Hz", &g_Config.bForce72Hz, true), - ConfigSetting("VRManualForceVR", &g_Config.bManualForceVR, false), - ConfigSetting("VRRescaleHUD", &g_Config.bRescaleHUD, true), - ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f), - ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f), - ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f), - ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0), - ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f), - ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f), - ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f), - ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f), - ConfigSetting("VRHeadRotationScale", &g_Config.fHeadRotationScale, 5.0f), - ConfigSetting("VRHeadRotationEnabled", &g_Config.bHeadRotationEnabled, false), - ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false), + ConfigSetting("VREnable", &g_Config.bEnableVR, true, true, false), + ConfigSetting("VREnable6DoF", &g_Config.bEnable6DoF, true, true, false), + ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, false, true, false), + ConfigSetting("VREnableMotions", &g_Config.bEnableMotions, true, true, false), + ConfigSetting("VRForce72Hz", &g_Config.bForce72Hz, true, true, false), + ConfigSetting("VRManualForceVR", &g_Config.bManualForceVR, false, true, false), + ConfigSetting("VRRescaleHUD", &g_Config.bRescaleHUD, true, true, false), + ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f, true, false), + ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f, true, false), + ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f, true, false), + ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0, true, false), + ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f, true, false), + ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f, true, false), + ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f, true, false), + ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f, true, false), + ConfigSetting("VRHeadRotationScale", &g_Config.fHeadRotationScale, 5.0f, true, false), + ConfigSetting("VRHeadRotationEnabled", &g_Config.bHeadRotationEnabled, false, true, false), + ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false, true, false), }; static const ConfigSectionSettings sections[] = { diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h index 7c0456c202..5dea999412 100644 --- a/Core/ConfigSettings.h +++ b/Core/ConfigSettings.h @@ -66,113 +66,113 @@ struct ConfigSetting { CustomButtonDefaultCallback customButton; }; - ConfigSetting(const char *ini, bool *v, bool def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, bool *v, bool def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { ptr_.b = v; cb_.b = nullptr; default_.b = def; } - ConfigSetting(const char *ini, int *v, int def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, int def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { ptr_.i = v; cb_.i = nullptr; default_.i = def; } - ConfigSetting(const char *ini, int *v, int def, std::string(*transTo)(int), int (*transFrom)(const std::string &), bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, int def, std::string(*transTo)(int), int (*transFrom)(const std::string &), bool save, bool perGame) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = nullptr; default_.i = def; } - ConfigSetting(const char *ini, uint32_t *v, uint32_t def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, uint32_t *v, uint32_t def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { ptr_.u = v; cb_.u = nullptr; default_.u = def; } - ConfigSetting(const char *ini, uint64_t *v, uint64_t def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, uint64_t *v, uint64_t def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_UINT64), report_(false), save_(save), perGame_(perGame) { ptr_.lu = v; cb_.lu = nullptr; default_.lu = def; } - ConfigSetting(const char *ini, float *v, float def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, float *v, float def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { ptr_.f = v; cb_.f = nullptr; default_.f = def; } - ConfigSetting(const char *ini, std::string *v, const char *def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, std::string *v, const char *def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { ptr_.s = v; cb_.s = nullptr; default_.s = def; } - ConfigSetting(const char *ini, Path *p, const char *def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, Path *p, const char *def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_PATH), report_(false), save_(save), perGame_(perGame) { ptr_.p = p; cb_.p = nullptr; default_.p = def; } - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, bool save = true, bool perGame = false) + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, bool save, bool perGame) : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { ptr_.touchPos = v; cb_.touchPos = nullptr; default_.touchPos = def; } - ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, bool save = true, bool perGame = false) + ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, bool save, bool perGame) : iniKey_(iniKey), ini2_(iniImage), ini3_(iniShape), ini4_(iniToggle), ini5_(iniRepeat), type_(TYPE_CUSTOM_BUTTON), report_(false), save_(save), perGame_(perGame) { ptr_.customButton = v; cb_.customButton = nullptr; default_.customButton = def; } - ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { ptr_.b = v; cb_.b = def; } - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { ptr_.i = v; cb_.i = def; } - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save, bool perGame) : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = def; } - ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { ptr_.u = v; cb_.u = def; } - ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { ptr_.f = v; cb_.f = def; } - ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, bool save, bool perGame) : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { ptr_.s = v; cb_.s = def; } - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, bool save = true, bool perGame = false) + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, bool save, bool perGame) : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { ptr_.touchPos = v; cb_.touchPos = def; @@ -211,13 +211,13 @@ struct ConfigSetting { struct ReportedConfigSetting : public ConfigSetting { template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, bool save = true, bool perGame = false) + ReportedConfigSetting(const char *ini, T1 *v, T2 def, bool save, bool perGame) : ConfigSetting(ini, v, def, save, perGame) { report_ = true; } template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save = true, bool perGame = false) + ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save, bool perGame) : ConfigSetting(ini, v, def, transTo, transFrom, save, perGame) { report_ = true; } From d077a75aa4010f72844f2d521185e3b0f427af79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 16:23:31 +0200 Subject: [PATCH 6/7] Merge "save" and "perGame" into a flags field --- Core/Config.cpp | 642 ++++++++++++++++++++-------------------- Core/ConfigSettings.cpp | 2 +- Core/ConfigSettings.h | 123 ++++---- 3 files changed, 392 insertions(+), 375 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index cf3d0a7acd..e07c9d0bf3 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -159,105 +159,105 @@ static float DefaultUISaturation() { } static const ConfigSetting generalSettings[] = { - ConfigSetting("FirstRun", &g_Config.bFirstRun, true, true, false), - ConfigSetting("RunCount", &g_Config.iRunCount, 0, true, false), - ConfigSetting("Enable Logging", &g_Config.bEnableLogging, true, true, false), - ConfigSetting("AutoRun", &g_Config.bAutoRun, true, true, false), - ConfigSetting("Browse", &g_Config.bBrowse, false, true, false), - ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true, false), - ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, "", true, false), - ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false, true, false), - ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true, true, false), - ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion, true, false), - ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), - ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... - ConfigSetting("UISound", &g_Config.bUISound, false, true, false), + ConfigSetting("FirstRun", &g_Config.bFirstRun, true, CfgFlag::DEFAULT), + ConfigSetting("RunCount", &g_Config.iRunCount, 0, CfgFlag::DEFAULT), + ConfigSetting("Enable Logging", &g_Config.bEnableLogging, true, CfgFlag::DEFAULT), + ConfigSetting("AutoRun", &g_Config.bAutoRun, true, CfgFlag::DEFAULT), + ConfigSetting("Browse", &g_Config.bBrowse, false, CfgFlag::DEFAULT), + ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, CfgFlag::DEFAULT), + ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, "", CfgFlag::DEFAULT), + ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false, CfgFlag::DEFAULT), + ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true, CfgFlag::DEFAULT), + ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion, CfgFlag::DEFAULT), + ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, CfgFlag::PER_GAME), + ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, CfgFlag::DEFAULT), // Or maybe it makes sense to have it per-game? Race conditions abound... + ConfigSetting("UISound", &g_Config.bUISound, false, CfgFlag::DEFAULT), - ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, true, true), - ReportedConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, true, true), - ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshRate, 77, true, true), - ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, true, true), - ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, true, false), + ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, CfgFlag::PER_GAME), + ReportedConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, CfgFlag::PER_GAME), + ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshRate, 77, CfgFlag::PER_GAME), + ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, CfgFlag::PER_GAME), + ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, CfgFlag::DEFAULT), - ConfigSetting("ScreenshotsAsPNG", &g_Config.bScreenshotsAsPNG, false, true, true), - ConfigSetting("UseFFV1", &g_Config.bUseFFV1, false, true, false), - ConfigSetting("DumpFrames", &g_Config.bDumpFrames, false, true, false), - ConfigSetting("DumpVideoOutput", &g_Config.bDumpVideoOutput, false, true, false), - ConfigSetting("DumpAudio", &g_Config.bDumpAudio, false, true, false), - ConfigSetting("SaveLoadResetsAVdumping", &g_Config.bSaveLoadResetsAVdumping, false, true, false), - ConfigSetting("StateSlot", &g_Config.iCurrentStateSlot, 0, true, true), - ConfigSetting("EnableStateUndo", &g_Config.bEnableStateUndo, &DefaultEnableStateUndo, true, true), - ConfigSetting("StateLoadUndoGame", &g_Config.sStateLoadUndoGame, "NA", true, false), - ConfigSetting("StateUndoLastSaveGame", &g_Config.sStateUndoLastSaveGame, "NA", true, false), - ConfigSetting("StateUndoLastSaveSlot", &g_Config.iStateUndoLastSaveSlot, -5, true, false), // Start with an "invalid" value - ConfigSetting("RewindSnapshotInterval", &g_Config.iRewindSnapshotInterval, 0, true, true), + ConfigSetting("ScreenshotsAsPNG", &g_Config.bScreenshotsAsPNG, false, CfgFlag::PER_GAME), + ConfigSetting("UseFFV1", &g_Config.bUseFFV1, false, CfgFlag::DEFAULT), + ConfigSetting("DumpFrames", &g_Config.bDumpFrames, false, CfgFlag::DEFAULT), + ConfigSetting("DumpVideoOutput", &g_Config.bDumpVideoOutput, false, CfgFlag::DEFAULT), + ConfigSetting("DumpAudio", &g_Config.bDumpAudio, false, CfgFlag::DEFAULT), + ConfigSetting("SaveLoadResetsAVdumping", &g_Config.bSaveLoadResetsAVdumping, false, CfgFlag::DEFAULT), + ConfigSetting("StateSlot", &g_Config.iCurrentStateSlot, 0, CfgFlag::PER_GAME), + ConfigSetting("EnableStateUndo", &g_Config.bEnableStateUndo, &DefaultEnableStateUndo, CfgFlag::PER_GAME), + ConfigSetting("StateLoadUndoGame", &g_Config.sStateLoadUndoGame, "NA", CfgFlag::DEFAULT), + ConfigSetting("StateUndoLastSaveGame", &g_Config.sStateUndoLastSaveGame, "NA", CfgFlag::DEFAULT), + ConfigSetting("StateUndoLastSaveSlot", &g_Config.iStateUndoLastSaveSlot, -5, CfgFlag::DEFAULT), // Start with an "invalid" value + ConfigSetting("RewindSnapshotInterval", &g_Config.iRewindSnapshotInterval, 0, CfgFlag::PER_GAME), - ConfigSetting("ShowOnScreenMessage", &g_Config.bShowOnScreenMessages, true, true, false), - ConfigSetting("ShowRegionOnGameIcon", &g_Config.bShowRegionOnGameIcon, false, true, false), - ConfigSetting("ShowIDOnGameIcon", &g_Config.bShowIDOnGameIcon, false, true, false), - ConfigSetting("GameGridScale", &g_Config.fGameGridScale, 1.0, true, false), - ConfigSetting("GridView1", &g_Config.bGridView1, true, true, false), - ConfigSetting("GridView2", &g_Config.bGridView2, true, true, false), - ConfigSetting("GridView3", &g_Config.bGridView3, false, true, false), - ConfigSetting("RightAnalogUp", &g_Config.iRightAnalogUp, 0, true, true), - ConfigSetting("RightAnalogDown", &g_Config.iRightAnalogDown, 0, true, true), - ConfigSetting("RightAnalogLeft", &g_Config.iRightAnalogLeft, 0, true, true), - ConfigSetting("RightAnalogRight", &g_Config.iRightAnalogRight, 0, true, true), - ConfigSetting("RightAnalogPress", &g_Config.iRightAnalogPress, 0, true, true), - ConfigSetting("RightAnalogCustom", &g_Config.bRightAnalogCustom, false, true, true), - ConfigSetting("RightAnalogDisableDiagonal", &g_Config.bRightAnalogDisableDiagonal, false, true, true), - ConfigSetting("SwipeUp", &g_Config.iSwipeUp, 0, true, true), - ConfigSetting("SwipeDown", &g_Config.iSwipeDown, 0, true, true), - ConfigSetting("SwipeLeft", &g_Config.iSwipeLeft, 0, true, true), - ConfigSetting("SwipeRight", &g_Config.iSwipeRight, 0, true, true), - ConfigSetting("SwipeSensitivity", &g_Config.fSwipeSensitivity, 1.0f, true, true), - ConfigSetting("SwipeSmoothing", &g_Config.fSwipeSmoothing, 0.3f, true, true), - ConfigSetting("DoubleTapGesture", &g_Config.iDoubleTapGesture, 0, true, true), - ConfigSetting("GestureControlEnabled", &g_Config.bGestureControlEnabled, false, true, true), + ConfigSetting("ShowOnScreenMessage", &g_Config.bShowOnScreenMessages, true, CfgFlag::DEFAULT), + ConfigSetting("ShowRegionOnGameIcon", &g_Config.bShowRegionOnGameIcon, false, CfgFlag::DEFAULT), + ConfigSetting("ShowIDOnGameIcon", &g_Config.bShowIDOnGameIcon, false, CfgFlag::DEFAULT), + ConfigSetting("GameGridScale", &g_Config.fGameGridScale, 1.0, CfgFlag::DEFAULT), + ConfigSetting("GridView1", &g_Config.bGridView1, true, CfgFlag::DEFAULT), + ConfigSetting("GridView2", &g_Config.bGridView2, true, CfgFlag::DEFAULT), + ConfigSetting("GridView3", &g_Config.bGridView3, false, CfgFlag::DEFAULT), + ConfigSetting("RightAnalogUp", &g_Config.iRightAnalogUp, 0, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogDown", &g_Config.iRightAnalogDown, 0, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogLeft", &g_Config.iRightAnalogLeft, 0, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogRight", &g_Config.iRightAnalogRight, 0, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogPress", &g_Config.iRightAnalogPress, 0, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogCustom", &g_Config.bRightAnalogCustom, false, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogDisableDiagonal", &g_Config.bRightAnalogDisableDiagonal, false, CfgFlag::PER_GAME), + ConfigSetting("SwipeUp", &g_Config.iSwipeUp, 0, CfgFlag::PER_GAME), + ConfigSetting("SwipeDown", &g_Config.iSwipeDown, 0, CfgFlag::PER_GAME), + ConfigSetting("SwipeLeft", &g_Config.iSwipeLeft, 0, CfgFlag::PER_GAME), + ConfigSetting("SwipeRight", &g_Config.iSwipeRight, 0, CfgFlag::PER_GAME), + ConfigSetting("SwipeSensitivity", &g_Config.fSwipeSensitivity, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("SwipeSmoothing", &g_Config.fSwipeSmoothing, 0.3f, CfgFlag::PER_GAME), + ConfigSetting("DoubleTapGesture", &g_Config.iDoubleTapGesture, 0, CfgFlag::PER_GAME), + ConfigSetting("GestureControlEnabled", &g_Config.bGestureControlEnabled, false, CfgFlag::PER_GAME), // "default" means let emulator decide, "" means disable. - ConfigSetting("ReportingHost", &g_Config.sReportHost, "default", true, false), - ConfigSetting("AutoSaveSymbolMap", &g_Config.bAutoSaveSymbolMap, false, true, true), - ConfigSetting("CacheFullIsoInRam", &g_Config.bCacheFullIsoInRam, false, true, true), - ConfigSetting("RemoteISOPort", &g_Config.iRemoteISOPort, 0, true, false), - ConfigSetting("LastRemoteISOServer", &g_Config.sLastRemoteISOServer, "", true, false), - ConfigSetting("LastRemoteISOPort", &g_Config.iLastRemoteISOPort, 0, true, false), - ConfigSetting("RemoteISOManualConfig", &g_Config.bRemoteISOManual, false, true, false), - ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false, true, false), - ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/", true, false), - ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false, true, false), + ConfigSetting("ReportingHost", &g_Config.sReportHost, "default", CfgFlag::DEFAULT), + ConfigSetting("AutoSaveSymbolMap", &g_Config.bAutoSaveSymbolMap, false, CfgFlag::PER_GAME), + ConfigSetting("CacheFullIsoInRam", &g_Config.bCacheFullIsoInRam, false, CfgFlag::PER_GAME), + ConfigSetting("RemoteISOPort", &g_Config.iRemoteISOPort, 0, CfgFlag::DEFAULT), + ConfigSetting("LastRemoteISOServer", &g_Config.sLastRemoteISOServer, "", CfgFlag::DEFAULT), + ConfigSetting("LastRemoteISOPort", &g_Config.iLastRemoteISOPort, 0, CfgFlag::DEFAULT), + ConfigSetting("RemoteISOManualConfig", &g_Config.bRemoteISOManual, false, CfgFlag::DEFAULT), + ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false, CfgFlag::DEFAULT), + ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/", CfgFlag::DEFAULT), + ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false, CfgFlag::DEFAULT), #ifdef __ANDROID__ ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, ROTATION_AUTO_HORIZONTAL), #endif - ConfigSetting("InternalScreenRotation", &g_Config.iInternalScreenRotation, ROTATION_LOCKED_HORIZONTAL, true, true), + ConfigSetting("InternalScreenRotation", &g_Config.iInternalScreenRotation, ROTATION_LOCKED_HORIZONTAL, CfgFlag::PER_GAME), - ConfigSetting("BackgroundAnimation", &g_Config.iBackgroundAnimation, 1, true, false), - ConfigSetting("TransparentBackground", &g_Config.bTransparentBackground, true, true, false), - ConfigSetting("UITint", &g_Config.fUITint, 0.0, true, false), - ConfigSetting("UISaturation", &g_Config.fUISaturation, &DefaultUISaturation, true, false), + ConfigSetting("BackgroundAnimation", &g_Config.iBackgroundAnimation, 1, CfgFlag::DEFAULT), + ConfigSetting("TransparentBackground", &g_Config.bTransparentBackground, true, CfgFlag::DEFAULT), + ConfigSetting("UITint", &g_Config.fUITint, 0.0, CfgFlag::DEFAULT), + ConfigSetting("UISaturation", &g_Config.fUISaturation, &DefaultUISaturation, CfgFlag::DEFAULT), #if defined(USING_WIN_UI) - ConfigSetting("TopMost", &g_Config.bTopMost, false, true, false), - ConfigSetting("PauseOnLostFocus", &g_Config.bPauseOnLostFocus, false, true, true), + ConfigSetting("TopMost", &g_Config.bTopMost, false, CfgFlag::DEFAULT), + ConfigSetting("PauseOnLostFocus", &g_Config.bPauseOnLostFocus, false, CfgFlag::PER_GAME), #endif #if !defined(MOBILE_DEVICE) - ConfigSetting("WindowX", &g_Config.iWindowX, -1, true, false), // -1 tells us to center the window. - ConfigSetting("WindowY", &g_Config.iWindowY, -1, true, false), - ConfigSetting("WindowWidth", &g_Config.iWindowWidth, 0, true, false), // 0 will be automatically reset later (need to do the AdjustWindowRect dance). - ConfigSetting("WindowHeight", &g_Config.iWindowHeight, 0, true, false), + ConfigSetting("WindowX", &g_Config.iWindowX, -1, CfgFlag::DEFAULT), // -1 tells us to center the window. + ConfigSetting("WindowY", &g_Config.iWindowY, -1, CfgFlag::DEFAULT), + ConfigSetting("WindowWidth", &g_Config.iWindowWidth, 0, CfgFlag::DEFAULT), // 0 will be automatically reset later (need to do the AdjustWindowRect dance). + ConfigSetting("WindowHeight", &g_Config.iWindowHeight, 0, CfgFlag::DEFAULT), #endif - ConfigSetting("PauseWhenMinimized", &g_Config.bPauseWhenMinimized, false, true, true), - ConfigSetting("DumpDecryptedEboots", &g_Config.bDumpDecryptedEboot, false, true, true), - ConfigSetting("FullscreenOnDoubleclick", &g_Config.bFullscreenOnDoubleclick, true, false, false), - ConfigSetting("ShowMenuBar", &g_Config.bShowMenuBar, true, true, false), + ConfigSetting("PauseWhenMinimized", &g_Config.bPauseWhenMinimized, false, CfgFlag::PER_GAME), + ConfigSetting("DumpDecryptedEboots", &g_Config.bDumpDecryptedEboot, false, CfgFlag::PER_GAME), + ConfigSetting("FullscreenOnDoubleclick", &g_Config.bFullscreenOnDoubleclick, true, CfgFlag::DONT_SAVE), + ConfigSetting("ShowMenuBar", &g_Config.bShowMenuBar, true, CfgFlag::DEFAULT), - ReportedConfigSetting("MemStickInserted", &g_Config.bMemStickInserted, true, true, true), - ConfigSetting("EnablePlugins", &g_Config.bLoadPlugins, true, true, true), + ReportedConfigSetting("MemStickInserted", &g_Config.bMemStickInserted, true, CfgFlag::PER_GAME), + ConfigSetting("EnablePlugins", &g_Config.bLoadPlugins, true, CfgFlag::PER_GAME), - ReportedConfigSetting("IgnoreCompatSettings", &g_Config.sIgnoreCompatSettings, "", true, true), + ReportedConfigSetting("IgnoreCompatSettings", &g_Config.sIgnoreCompatSettings, "", CfgFlag::PER_GAME), }; static bool DefaultSasThread() { @@ -265,16 +265,16 @@ static bool DefaultSasThread() { } static const ConfigSetting cpuSettings[] = { - ReportedConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, true, true), - ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, true, true), - ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, true, true), - ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, true, true), - ReportedConfigSetting("FunctionReplacements", &g_Config.bFuncReplacements, true, true, true), - ConfigSetting("HideSlowWarnings", &g_Config.bHideSlowWarnings, false, true, false), - ConfigSetting("HideStateWarnings", &g_Config.bHideStateWarnings, false, true, false), - ConfigSetting("PreloadFunctions", &g_Config.bPreloadFunctions, false, true, true), - ConfigSetting("JitDisableFlags", &g_Config.uJitDisableFlags, (uint32_t)0, true, true), - ReportedConfigSetting("CPUSpeed", &g_Config.iLockedCPUSpeed, 0, true, true), + ReportedConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, CfgFlag::PER_GAME), + ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, CfgFlag::PER_GAME), + ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, CfgFlag::PER_GAME), + ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, CfgFlag::PER_GAME), + ReportedConfigSetting("FunctionReplacements", &g_Config.bFuncReplacements, true, CfgFlag::PER_GAME), + ConfigSetting("HideSlowWarnings", &g_Config.bHideSlowWarnings, false, CfgFlag::DEFAULT), + ConfigSetting("HideStateWarnings", &g_Config.bHideStateWarnings, false, CfgFlag::DEFAULT), + ConfigSetting("PreloadFunctions", &g_Config.bPreloadFunctions, false, CfgFlag::PER_GAME), + ConfigSetting("JitDisableFlags", &g_Config.uJitDisableFlags, (uint32_t)0, CfgFlag::PER_GAME), + ReportedConfigSetting("CPUSpeed", &g_Config.iLockedCPUSpeed, 0, CfgFlag::PER_GAME), }; static int DefaultInternalResolution() { @@ -469,105 +469,105 @@ std::string FastForwardModeToString(int v) { } static const ConfigSetting graphicsSettings[] = { - ConfigSetting("EnableCardboardVR", &g_Config.bEnableCardboardVR, false, true, true), - ConfigSetting("CardboardScreenSize", &g_Config.iCardboardScreenSize, 50, true, true), - ConfigSetting("CardboardXShift", &g_Config.iCardboardXShift, 0, true, true), - ConfigSetting("CardboardYShift", &g_Config.iCardboardYShift, 0, true, true), - ConfigSetting("iShowStatusFlags", &g_Config.iShowStatusFlags, 0, true, true), - ReportedConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, true, false), - ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, "", true, false), - ConfigSetting("DisabledGraphicsBackends", &g_Config.sDisabledGPUBackends, "", true, false), - ConfigSetting("VulkanDevice", &g_Config.sVulkanDevice, "", true, false), + ConfigSetting("EnableCardboardVR", &g_Config.bEnableCardboardVR, false, CfgFlag::PER_GAME), + ConfigSetting("CardboardScreenSize", &g_Config.iCardboardScreenSize, 50, CfgFlag::PER_GAME), + ConfigSetting("CardboardXShift", &g_Config.iCardboardXShift, 0, CfgFlag::PER_GAME), + ConfigSetting("CardboardYShift", &g_Config.iCardboardYShift, 0, CfgFlag::PER_GAME), + ConfigSetting("iShowStatusFlags", &g_Config.iShowStatusFlags, 0, CfgFlag::PER_GAME), + ReportedConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, CfgFlag::DEFAULT), + ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, "", CfgFlag::DEFAULT), + ConfigSetting("DisabledGraphicsBackends", &g_Config.sDisabledGPUBackends, "", CfgFlag::DEFAULT), + ConfigSetting("VulkanDevice", &g_Config.sVulkanDevice, "", CfgFlag::DEFAULT), #ifdef _WIN32 - ConfigSetting("D3D11Device", &g_Config.sD3D11Device, "", true, false), + ConfigSetting("D3D11Device", &g_Config.sD3D11Device, "", CfgFlag::DEFAULT), #endif - ConfigSetting("CameraDevice", &g_Config.sCameraDevice, "", true, false), - ConfigSetting("VendorBugChecksEnabled", &g_Config.bVendorBugChecksEnabled, true, false, false), - ConfigSetting("UseGeometryShader", &g_Config.bUseGeometryShader, false, true, true), - ReportedConfigSetting("SkipBufferEffects", &g_Config.bSkipBufferEffects, false, true, true), - ConfigSetting("SoftwareRenderer", &g_Config.bSoftwareRendering, false, true, true), - ConfigSetting("SoftwareRendererJit", &g_Config.bSoftwareRenderingJit, true, true, true), - ReportedConfigSetting("HardwareTransform", &g_Config.bHardwareTransform, true, true, true), - ReportedConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, true, true), - ReportedConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, true, true), - ReportedConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, true, true), - ReportedConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, true, true), - ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, true, true), - ReportedConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, true, true), - ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), true, true), - ConfigSetting("StereoRendering", &g_Config.bStereoRendering, false, true, true), - ConfigSetting("StereoToMonoShader", &g_Config.sStereoToMonoShader, "RedBlue", true, true), - ConfigSetting("FrameRate", &g_Config.iFpsLimit1, 0, true, true), - ConfigSetting("FrameRate2", &g_Config.iFpsLimit2, -1, true, true), - ConfigSetting("AnalogFrameRate", &g_Config.iAnalogFpsLimit, 240, true, true), - ConfigSetting("UnthrottlingMode", &g_Config.iFastForwardMode, &DefaultFastForwardMode, &FastForwardModeToString, &FastForwardModeFromString, true, true), + ConfigSetting("CameraDevice", &g_Config.sCameraDevice, "", CfgFlag::DEFAULT), + ConfigSetting("VendorBugChecksEnabled", &g_Config.bVendorBugChecksEnabled, true, CfgFlag::DONT_SAVE), + ConfigSetting("UseGeometryShader", &g_Config.bUseGeometryShader, false, CfgFlag::PER_GAME), + ReportedConfigSetting("SkipBufferEffects", &g_Config.bSkipBufferEffects, false, CfgFlag::PER_GAME), + ConfigSetting("SoftwareRenderer", &g_Config.bSoftwareRendering, false, CfgFlag::PER_GAME), + ConfigSetting("SoftwareRendererJit", &g_Config.bSoftwareRenderingJit, true, CfgFlag::PER_GAME), + ReportedConfigSetting("HardwareTransform", &g_Config.bHardwareTransform, true, CfgFlag::PER_GAME), + ReportedConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, CfgFlag::PER_GAME), + ReportedConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, CfgFlag::PER_GAME), + ReportedConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, CfgFlag::PER_GAME), + ReportedConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, CfgFlag::PER_GAME), + ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, CfgFlag::PER_GAME), + ReportedConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, CfgFlag::PER_GAME), + ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), CfgFlag::PER_GAME), + ConfigSetting("StereoRendering", &g_Config.bStereoRendering, false, CfgFlag::PER_GAME), + ConfigSetting("StereoToMonoShader", &g_Config.sStereoToMonoShader, "RedBlue", CfgFlag::PER_GAME), + ConfigSetting("FrameRate", &g_Config.iFpsLimit1, 0, CfgFlag::PER_GAME), + ConfigSetting("FrameRate2", &g_Config.iFpsLimit2, -1, CfgFlag::PER_GAME), + ConfigSetting("AnalogFrameRate", &g_Config.iAnalogFpsLimit, 240, CfgFlag::PER_GAME), + ConfigSetting("UnthrottlingMode", &g_Config.iFastForwardMode, &DefaultFastForwardMode, &FastForwardModeToString, &FastForwardModeFromString, CfgFlag::PER_GAME), #if defined(USING_WIN_UI) - ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false, false), + ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, CfgFlag::DONT_SAVE), #endif // Most low-performance (and many high performance) mobile GPUs do not support aniso anyway so defaulting to 4 is fine. - ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, true, true), - ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, true, true), // Number of samples is 1 << iMultiSampleLevel + ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, CfgFlag::PER_GAME), + ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, CfgFlag::PER_GAME), // Number of samples is 1 << iMultiSampleLevel - ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, true, true), - ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, true, true), - ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false, false), + ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, CfgFlag::PER_GAME), + ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, CfgFlag::PER_GAME), + ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, CfgFlag::DONT_SAVE), #ifndef MOBILE_DEVICE - ConfigSetting("FullScreen", &g_Config.bFullScreen, false, true, false), - ConfigSetting("FullScreenMulti", &g_Config.bFullScreenMulti, false, true, false), + ConfigSetting("FullScreen", &g_Config.bFullScreen, false, CfgFlag::DEFAULT), + ConfigSetting("FullScreenMulti", &g_Config.bFullScreenMulti, false, CfgFlag::DEFAULT), #endif - ConfigSetting("BufferFiltering", &g_Config.iDisplayFilter, SCALE_LINEAR, true, true), - ConfigSetting("DisplayOffsetX", &g_Config.fDisplayOffsetX, 0.5f, true, true), - ConfigSetting("DisplayOffsetY", &g_Config.fDisplayOffsetY, 0.5f, true, true), - ConfigSetting("DisplayScale", &g_Config.fDisplayScale, 1.0f, true, true), - ConfigSetting("DisplayIntegerScale", &g_Config.bDisplayIntegerScale, false, true, true), - ConfigSetting("DisplayAspectRatio", &g_Config.fDisplayAspectRatio, 1.0f, true, true), - ConfigSetting("DisplayStretch", &g_Config.bDisplayStretch, false, true, true), + ConfigSetting("BufferFiltering", &g_Config.iDisplayFilter, SCALE_LINEAR, CfgFlag::PER_GAME), + ConfigSetting("DisplayOffsetX", &g_Config.fDisplayOffsetX, 0.5f, CfgFlag::PER_GAME), + ConfigSetting("DisplayOffsetY", &g_Config.fDisplayOffsetY, 0.5f, CfgFlag::PER_GAME), + ConfigSetting("DisplayScale", &g_Config.fDisplayScale, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("DisplayIntegerScale", &g_Config.bDisplayIntegerScale, false, CfgFlag::PER_GAME), + ConfigSetting("DisplayAspectRatio", &g_Config.fDisplayAspectRatio, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("DisplayStretch", &g_Config.bDisplayStretch, false, CfgFlag::PER_GAME), - ConfigSetting("ImmersiveMode", &g_Config.bImmersiveMode, true, true, true), - ConfigSetting("SustainedPerformanceMode", &g_Config.bSustainedPerformanceMode, false, true, true), - ConfigSetting("IgnoreScreenInsets", &g_Config.bIgnoreScreenInsets, true, true, false), + ConfigSetting("ImmersiveMode", &g_Config.bImmersiveMode, true, CfgFlag::PER_GAME), + ConfigSetting("SustainedPerformanceMode", &g_Config.bSustainedPerformanceMode, false, CfgFlag::PER_GAME), + ConfigSetting("IgnoreScreenInsets", &g_Config.bIgnoreScreenInsets, true, CfgFlag::DEFAULT), - ReportedConfigSetting("ReplaceTextures", &g_Config.bReplaceTextures, true, true, true), - ReportedConfigSetting("SaveNewTextures", &g_Config.bSaveNewTextures, false, true, true), - ConfigSetting("IgnoreTextureFilenames", &g_Config.bIgnoreTextureFilenames, false, true, true), + ReportedConfigSetting("ReplaceTextures", &g_Config.bReplaceTextures, true, CfgFlag::PER_GAME), + ReportedConfigSetting("SaveNewTextures", &g_Config.bSaveNewTextures, false, CfgFlag::PER_GAME), + ConfigSetting("IgnoreTextureFilenames", &g_Config.bIgnoreTextureFilenames, false, CfgFlag::PER_GAME), - ReportedConfigSetting("TexScalingLevel", &g_Config.iTexScalingLevel, 1, true, true), - ReportedConfigSetting("TexScalingType", &g_Config.iTexScalingType, 0, true, true), - ReportedConfigSetting("TexDeposterize", &g_Config.bTexDeposterize, false, true, true), - ReportedConfigSetting("TexHardwareScaling", &g_Config.bTexHardwareScaling, false, true, true), - ConfigSetting("VSyncInterval", &g_Config.bVSync, false, true, true), - ReportedConfigSetting("BloomHack", &g_Config.iBloomHack, 0, true, true), + ReportedConfigSetting("TexScalingLevel", &g_Config.iTexScalingLevel, 1, CfgFlag::PER_GAME), + ReportedConfigSetting("TexScalingType", &g_Config.iTexScalingType, 0, CfgFlag::PER_GAME), + ReportedConfigSetting("TexDeposterize", &g_Config.bTexDeposterize, false, CfgFlag::PER_GAME), + ReportedConfigSetting("TexHardwareScaling", &g_Config.bTexHardwareScaling, false, CfgFlag::PER_GAME), + ConfigSetting("VSyncInterval", &g_Config.bVSync, false, CfgFlag::PER_GAME), + ReportedConfigSetting("BloomHack", &g_Config.iBloomHack, 0, CfgFlag::PER_GAME), // Not really a graphics setting... - ReportedConfigSetting("SplineBezierQuality", &g_Config.iSplineBezierQuality, 2, true, true), - ReportedConfigSetting("HardwareTessellation", &g_Config.bHardwareTessellation, false, true, true), - ConfigSetting("TextureShader", &g_Config.sTextureShaderName, "Off", true, true), - ConfigSetting("ShaderChainRequires60FPS", &g_Config.bShaderChainRequires60FPS, false, true, true), + ReportedConfigSetting("SplineBezierQuality", &g_Config.iSplineBezierQuality, 2, CfgFlag::PER_GAME), + ReportedConfigSetting("HardwareTessellation", &g_Config.bHardwareTessellation, false, CfgFlag::PER_GAME), + ConfigSetting("TextureShader", &g_Config.sTextureShaderName, "Off", CfgFlag::PER_GAME), + ConfigSetting("ShaderChainRequires60FPS", &g_Config.bShaderChainRequires60FPS, false, CfgFlag::PER_GAME), - ReportedConfigSetting("SkipGPUReadbacks", &g_Config.bSkipGPUReadbacks, false, true, true), + ReportedConfigSetting("SkipGPUReadbacks", &g_Config.bSkipGPUReadbacks, false, CfgFlag::PER_GAME), - ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, false, false), - ConfigSetting("LogFrameDrops", &g_Config.bLogFrameDrops, false, true, false), + ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, CfgFlag::DONT_SAVE), + ConfigSetting("LogFrameDrops", &g_Config.bLogFrameDrops, false, CfgFlag::DEFAULT), - ConfigSetting("InflightFrames", &g_Config.iInflightFrames, 3, true, false), - ConfigSetting("RenderDuplicateFrames", &g_Config.bRenderDuplicateFrames, false, true, true), + ConfigSetting("InflightFrames", &g_Config.iInflightFrames, 3, CfgFlag::DEFAULT), + ConfigSetting("RenderDuplicateFrames", &g_Config.bRenderDuplicateFrames, false, CfgFlag::PER_GAME), - ConfigSetting("ShaderCache", &g_Config.bShaderCache, true, false, false), // Doesn't save. Ini-only. - ConfigSetting("GpuLogProfiler", &g_Config.bGpuLogProfiler, false, true, false), + ConfigSetting("ShaderCache", &g_Config.bShaderCache, true, CfgFlag::DONT_SAVE), // Doesn't save. Ini-only. + ConfigSetting("GpuLogProfiler", &g_Config.bGpuLogProfiler, false, CfgFlag::DEFAULT), }; static const ConfigSetting soundSettings[] = { - ConfigSetting("Enable", &g_Config.bEnableSound, true, true, true), - ConfigSetting("AudioBackend", &g_Config.iAudioBackend, 0, true, true), - ConfigSetting("ExtraAudioBuffering", &g_Config.bExtraAudioBuffering, false, true, false), - ConfigSetting("GlobalVolume", &g_Config.iGlobalVolume, VOLUME_FULL, true, true), - ConfigSetting("ReverbVolume", &g_Config.iReverbVolume, VOLUME_FULL, true, true), - ConfigSetting("AltSpeedVolume", &g_Config.iAltSpeedVolume, -1, true, true), - ConfigSetting("AudioDevice", &g_Config.sAudioDevice, "", true, false), - ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, true, false), + ConfigSetting("Enable", &g_Config.bEnableSound, true, CfgFlag::PER_GAME), + ConfigSetting("AudioBackend", &g_Config.iAudioBackend, 0, CfgFlag::PER_GAME), + ConfigSetting("ExtraAudioBuffering", &g_Config.bExtraAudioBuffering, false, CfgFlag::DEFAULT), + ConfigSetting("GlobalVolume", &g_Config.iGlobalVolume, VOLUME_FULL, CfgFlag::PER_GAME), + ConfigSetting("ReverbVolume", &g_Config.iReverbVolume, VOLUME_FULL, CfgFlag::PER_GAME), + ConfigSetting("AltSpeedVolume", &g_Config.iAltSpeedVolume, -1, CfgFlag::PER_GAME), + ConfigSetting("AudioDevice", &g_Config.sAudioDevice, "", CfgFlag::DEFAULT), + ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, CfgFlag::DEFAULT), }; static bool DefaultShowTouchControls() { @@ -595,125 +595,125 @@ static const ConfigTouchPos defaultTouchPosShow = { -1.0f, -1.0f, defaultControl static const ConfigTouchPos defaultTouchPosHide = { -1.0f, -1.0f, defaultControlScale, false }; static const ConfigSetting controlSettings[] = { - ConfigSetting("HapticFeedback", &g_Config.bHapticFeedback, false, true, true), - ConfigSetting("ShowTouchCross", &g_Config.bShowTouchCross, true, true, true), - ConfigSetting("ShowTouchCircle", &g_Config.bShowTouchCircle, true, true, true), - ConfigSetting("ShowTouchSquare", &g_Config.bShowTouchSquare, true, true, true), - ConfigSetting("ShowTouchTriangle", &g_Config.bShowTouchTriangle, true, true, true), + ConfigSetting("HapticFeedback", &g_Config.bHapticFeedback, false, CfgFlag::PER_GAME), + ConfigSetting("ShowTouchCross", &g_Config.bShowTouchCross, true, CfgFlag::PER_GAME), + ConfigSetting("ShowTouchCircle", &g_Config.bShowTouchCircle, true, CfgFlag::PER_GAME), + ConfigSetting("ShowTouchSquare", &g_Config.bShowTouchSquare, true, CfgFlag::PER_GAME), + ConfigSetting("ShowTouchTriangle", &g_Config.bShowTouchTriangle, true, CfgFlag::PER_GAME), - ConfigSetting("Custom0Mapping", "Custom0Image", "Custom0Shape", "Custom0Toggle", "Custom0Repeat", &g_Config.CustomButton0, {0, 0, 0, false, false}, true, true), - ConfigSetting("Custom1Mapping", "Custom1Image", "Custom1Shape", "Custom1Toggle", "Custom1Repeat", &g_Config.CustomButton1, {0, 1, 0, false, false}, true, true), - ConfigSetting("Custom2Mapping", "Custom2Image", "Custom2Shape", "Custom2Toggle", "Custom2Repeat", &g_Config.CustomButton2, {0, 2, 0, false, false}, true, true), - ConfigSetting("Custom3Mapping", "Custom3Image", "Custom3Shape", "Custom3Toggle", "Custom3Repeat", &g_Config.CustomButton3, {0, 3, 0, false, false}, true, true), - ConfigSetting("Custom4Mapping", "Custom4Image", "Custom4Shape", "Custom4Toggle", "Custom4Repeat", &g_Config.CustomButton4, {0, 4, 0, false, false}, true, true), - ConfigSetting("Custom5Mapping", "Custom5Image", "Custom5Shape", "Custom5Toggle", "Custom5Repeat", &g_Config.CustomButton5, {0, 0, 1, false, false}, true, true), - ConfigSetting("Custom6Mapping", "Custom6Image", "Custom6Shape", "Custom6Toggle", "Custom6Repeat", &g_Config.CustomButton6, {0, 1, 1, false, false}, true, true), - ConfigSetting("Custom7Mapping", "Custom7Image", "Custom7Shape", "Custom7Toggle", "Custom7Repeat", &g_Config.CustomButton7, {0, 2, 1, false, false}, true, true), - ConfigSetting("Custom8Mapping", "Custom8Image", "Custom8Shape", "Custom8Toggle", "Custom8Repeat", &g_Config.CustomButton8, {0, 3, 1, false, false}, true, true), - ConfigSetting("Custom9Mapping", "Custom9Image", "Custom9Shape", "Custom9Toggle", "Custom9Repeat", &g_Config.CustomButton9, {0, 4, 1, false, false}, true, true), + ConfigSetting("Custom0Mapping", "Custom0Image", "Custom0Shape", "Custom0Toggle", "Custom0Repeat", &g_Config.CustomButton0, {0, 0, 0, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom1Mapping", "Custom1Image", "Custom1Shape", "Custom1Toggle", "Custom1Repeat", &g_Config.CustomButton1, {0, 1, 0, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom2Mapping", "Custom2Image", "Custom2Shape", "Custom2Toggle", "Custom2Repeat", &g_Config.CustomButton2, {0, 2, 0, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom3Mapping", "Custom3Image", "Custom3Shape", "Custom3Toggle", "Custom3Repeat", &g_Config.CustomButton3, {0, 3, 0, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom4Mapping", "Custom4Image", "Custom4Shape", "Custom4Toggle", "Custom4Repeat", &g_Config.CustomButton4, {0, 4, 0, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom5Mapping", "Custom5Image", "Custom5Shape", "Custom5Toggle", "Custom5Repeat", &g_Config.CustomButton5, {0, 0, 1, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom6Mapping", "Custom6Image", "Custom6Shape", "Custom6Toggle", "Custom6Repeat", &g_Config.CustomButton6, {0, 1, 1, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom7Mapping", "Custom7Image", "Custom7Shape", "Custom7Toggle", "Custom7Repeat", &g_Config.CustomButton7, {0, 2, 1, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom8Mapping", "Custom8Image", "Custom8Shape", "Custom8Toggle", "Custom8Repeat", &g_Config.CustomButton8, {0, 3, 1, false, false}, CfgFlag::PER_GAME), + ConfigSetting("Custom9Mapping", "Custom9Image", "Custom9Shape", "Custom9Toggle", "Custom9Repeat", &g_Config.CustomButton9, {0, 4, 1, false, false}, CfgFlag::PER_GAME), // Combo keys are going to be something else, but I don't want to break the config. - ConfigSetting("fcombo0X", "fcombo0Y", "comboKeyScale0", "ShowComboKey0", &g_Config.touchCustom0, defaultTouchPosHide, true, true), - ConfigSetting("fcombo1X", "fcombo1Y", "comboKeyScale1", "ShowComboKey1", &g_Config.touchCustom1, defaultTouchPosHide, true, true), - ConfigSetting("fcombo2X", "fcombo2Y", "comboKeyScale2", "ShowComboKey2", &g_Config.touchCustom2, defaultTouchPosHide, true, true), - ConfigSetting("fcombo3X", "fcombo3Y", "comboKeyScale3", "ShowComboKey3", &g_Config.touchCustom3, defaultTouchPosHide, true, true), - ConfigSetting("fcombo4X", "fcombo4Y", "comboKeyScale4", "ShowComboKey4", &g_Config.touchCustom4, defaultTouchPosHide, true, true), - ConfigSetting("fcombo5X", "fcombo5Y", "comboKeyScale5", "ShowComboKey5", &g_Config.touchCustom5, defaultTouchPosHide, true, true), - ConfigSetting("fcombo6X", "fcombo6Y", "comboKeyScale6", "ShowComboKey6", &g_Config.touchCustom6, defaultTouchPosHide, true, true), - ConfigSetting("fcombo7X", "fcombo7Y", "comboKeyScale7", "ShowComboKey7", &g_Config.touchCustom7, defaultTouchPosHide, true, true), - ConfigSetting("fcombo8X", "fcombo8Y", "comboKeyScale8", "ShowComboKey8", &g_Config.touchCustom8, defaultTouchPosHide, true, true), - ConfigSetting("fcombo9X", "fcombo9Y", "comboKeyScale9", "ShowComboKey9", &g_Config.touchCustom9, defaultTouchPosHide, true, true), + ConfigSetting("fcombo0X", "fcombo0Y", "comboKeyScale0", "ShowComboKey0", &g_Config.touchCustom0, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo1X", "fcombo1Y", "comboKeyScale1", "ShowComboKey1", &g_Config.touchCustom1, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo2X", "fcombo2Y", "comboKeyScale2", "ShowComboKey2", &g_Config.touchCustom2, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo3X", "fcombo3Y", "comboKeyScale3", "ShowComboKey3", &g_Config.touchCustom3, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo4X", "fcombo4Y", "comboKeyScale4", "ShowComboKey4", &g_Config.touchCustom4, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo5X", "fcombo5Y", "comboKeyScale5", "ShowComboKey5", &g_Config.touchCustom5, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo6X", "fcombo6Y", "comboKeyScale6", "ShowComboKey6", &g_Config.touchCustom6, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo7X", "fcombo7Y", "comboKeyScale7", "ShowComboKey7", &g_Config.touchCustom7, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo8X", "fcombo8Y", "comboKeyScale8", "ShowComboKey8", &g_Config.touchCustom8, defaultTouchPosHide, CfgFlag::PER_GAME), + ConfigSetting("fcombo9X", "fcombo9Y", "comboKeyScale9", "ShowComboKey9", &g_Config.touchCustom9, defaultTouchPosHide, CfgFlag::PER_GAME), #if defined(_WIN32) // A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes // sense to default this to on. - ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, true, false), + ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, CfgFlag::DEFAULT), #else - ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, true, false), + ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, CfgFlag::DEFAULT), #endif #if defined(USING_WIN_UI) - ConfigSetting("IgnoreWindowsKey", &g_Config.bIgnoreWindowsKey, false, true, true), + ConfigSetting("IgnoreWindowsKey", &g_Config.bIgnoreWindowsKey, false, CfgFlag::PER_GAME), #endif - ConfigSetting("ShowTouchControls", &g_Config.bShowTouchControls, &DefaultShowTouchControls, true, true), + ConfigSetting("ShowTouchControls", &g_Config.bShowTouchControls, &DefaultShowTouchControls, CfgFlag::PER_GAME), // ConfigSetting("KeyMapping", &g_Config.iMappingMap, 0), #ifdef MOBILE_DEVICE - ConfigSetting("TiltBaseAngleY", &g_Config.fTiltBaseAngleY, 0.9f, true, true), - ConfigSetting("TiltInvertX", &g_Config.bInvertTiltX, false, true, true), - ConfigSetting("TiltInvertY", &g_Config.bInvertTiltY, false, true, true), - ConfigSetting("TiltSensitivityX", &g_Config.iTiltSensitivityX, 60, true, true), - ConfigSetting("TiltSensitivityY", &g_Config.iTiltSensitivityY, 60, true, true), - ConfigSetting("TiltAnalogDeadzoneRadius", &g_Config.fTiltAnalogDeadzoneRadius, 0.0f, true, true), - ConfigSetting("TiltInputType", &g_Config.iTiltInputType, 0, true, true), + ConfigSetting("TiltBaseAngleY", &g_Config.fTiltBaseAngleY, 0.9f, CfgFlag::PER_GAME), + ConfigSetting("TiltInvertX", &g_Config.bInvertTiltX, false, CfgFlag::PER_GAME), + ConfigSetting("TiltInvertY", &g_Config.bInvertTiltY, false, CfgFlag::PER_GAME), + ConfigSetting("TiltSensitivityX", &g_Config.iTiltSensitivityX, 60, CfgFlag::PER_GAME), + ConfigSetting("TiltSensitivityY", &g_Config.iTiltSensitivityY, 60, CfgFlag::PER_GAME), + ConfigSetting("TiltAnalogDeadzoneRadius", &g_Config.fTiltAnalogDeadzoneRadius, 0.0f, CfgFlag::PER_GAME), + ConfigSetting("TiltInputType", &g_Config.iTiltInputType, 0, CfgFlag::PER_GAME), #endif - ConfigSetting("DisableDpadDiagonals", &g_Config.bDisableDpadDiagonals, false, true, true), - ConfigSetting("GamepadOnlyFocused", &g_Config.bGamepadOnlyFocused, false, true, true), - ConfigSetting("TouchButtonStyle", &g_Config.iTouchButtonStyle, 1, true, true), - ConfigSetting("TouchButtonOpacity", &g_Config.iTouchButtonOpacity, 65, true, true), - ConfigSetting("TouchButtonHideSeconds", &g_Config.iTouchButtonHideSeconds, 20, true, true), - ConfigSetting("AutoCenterTouchAnalog", &g_Config.bAutoCenterTouchAnalog, false, true, true), + ConfigSetting("DisableDpadDiagonals", &g_Config.bDisableDpadDiagonals, false, CfgFlag::PER_GAME), + ConfigSetting("GamepadOnlyFocused", &g_Config.bGamepadOnlyFocused, false, CfgFlag::PER_GAME), + ConfigSetting("TouchButtonStyle", &g_Config.iTouchButtonStyle, 1, CfgFlag::PER_GAME), + ConfigSetting("TouchButtonOpacity", &g_Config.iTouchButtonOpacity, 65, CfgFlag::PER_GAME), + ConfigSetting("TouchButtonHideSeconds", &g_Config.iTouchButtonHideSeconds, 20, CfgFlag::PER_GAME), + ConfigSetting("AutoCenterTouchAnalog", &g_Config.bAutoCenterTouchAnalog, false, CfgFlag::PER_GAME), // Snap touch control position - ConfigSetting("TouchSnapToGrid", &g_Config.bTouchSnapToGrid, false, true, true), - ConfigSetting("TouchSnapGridSize", &g_Config.iTouchSnapGridSize, 64, true, true), + ConfigSetting("TouchSnapToGrid", &g_Config.bTouchSnapToGrid, false, CfgFlag::PER_GAME), + ConfigSetting("TouchSnapGridSize", &g_Config.iTouchSnapGridSize, 64, CfgFlag::PER_GAME), // -1.0f means uninitialized, set in GamepadEmu::CreatePadLayout(). - ConfigSetting("ActionButtonSpacing2", &g_Config.fActionButtonSpacing, 1.0f, true, true), - ConfigSetting("ActionButtonCenterX", "ActionButtonCenterY", "ActionButtonScale", nullptr, &g_Config.touchActionButtonCenter, defaultTouchPosShow, true, true), - ConfigSetting("DPadX", "DPadY", "DPadScale", "ShowTouchDpad", &g_Config.touchDpad, defaultTouchPosShow, true, true), + ConfigSetting("ActionButtonSpacing2", &g_Config.fActionButtonSpacing, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("ActionButtonCenterX", "ActionButtonCenterY", "ActionButtonScale", nullptr, &g_Config.touchActionButtonCenter, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("DPadX", "DPadY", "DPadScale", "ShowTouchDpad", &g_Config.touchDpad, defaultTouchPosShow, CfgFlag::PER_GAME), // Note: these will be overwritten if DPadRadius is set. - ConfigSetting("DPadSpacing", &g_Config.fDpadSpacing, 1.0f, true, true), - ConfigSetting("StartKeyX", "StartKeyY", "StartKeyScale", "ShowTouchStart", &g_Config.touchStartKey, defaultTouchPosShow, true, true), - ConfigSetting("SelectKeyX", "SelectKeyY", "SelectKeyScale", "ShowTouchSelect", &g_Config.touchSelectKey, defaultTouchPosShow, true, true), - ConfigSetting("UnthrottleKeyX", "UnthrottleKeyY", "UnthrottleKeyScale", "ShowTouchUnthrottle", &g_Config.touchFastForwardKey, defaultTouchPosShow, true, true), - ConfigSetting("LKeyX", "LKeyY", "LKeyScale", "ShowTouchLTrigger", &g_Config.touchLKey, defaultTouchPosShow, true, true), - ConfigSetting("RKeyX", "RKeyY", "RKeyScale", "ShowTouchRTrigger", &g_Config.touchRKey, defaultTouchPosShow, true, true), - ConfigSetting("AnalogStickX", "AnalogStickY", "AnalogStickScale", "ShowAnalogStick", &g_Config.touchAnalogStick, defaultTouchPosShow, true, true), - ConfigSetting("RightAnalogStickX", "RightAnalogStickY", "RightAnalogStickScale", "ShowRightAnalogStick", &g_Config.touchRightAnalogStick, defaultTouchPosHide, true, true), + ConfigSetting("DPadSpacing", &g_Config.fDpadSpacing, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("StartKeyX", "StartKeyY", "StartKeyScale", "ShowTouchStart", &g_Config.touchStartKey, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("SelectKeyX", "SelectKeyY", "SelectKeyScale", "ShowTouchSelect", &g_Config.touchSelectKey, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("UnthrottleKeyX", "UnthrottleKeyY", "UnthrottleKeyScale", "ShowTouchUnthrottle", &g_Config.touchFastForwardKey, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("LKeyX", "LKeyY", "LKeyScale", "ShowTouchLTrigger", &g_Config.touchLKey, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("RKeyX", "RKeyY", "RKeyScale", "ShowTouchRTrigger", &g_Config.touchRKey, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("AnalogStickX", "AnalogStickY", "AnalogStickScale", "ShowAnalogStick", &g_Config.touchAnalogStick, defaultTouchPosShow, CfgFlag::PER_GAME), + ConfigSetting("RightAnalogStickX", "RightAnalogStickY", "RightAnalogStickScale", "ShowRightAnalogStick", &g_Config.touchRightAnalogStick, defaultTouchPosHide, CfgFlag::PER_GAME), - ConfigSetting("AnalogDeadzone", &g_Config.fAnalogDeadzone, 0.15f, true, true), - ConfigSetting("AnalogInverseDeadzone", &g_Config.fAnalogInverseDeadzone, 0.0f, true, true), - ConfigSetting("AnalogSensitivity", &g_Config.fAnalogSensitivity, 1.1f, true, true), - ConfigSetting("AnalogIsCircular", &g_Config.bAnalogIsCircular, false, true, true), - ConfigSetting("AnalogAutoRotSpeed", &g_Config.fAnalogAutoRotSpeed, 8.0f, true, true), + ConfigSetting("AnalogDeadzone", &g_Config.fAnalogDeadzone, 0.15f, CfgFlag::PER_GAME), + ConfigSetting("AnalogInverseDeadzone", &g_Config.fAnalogInverseDeadzone, 0.0f, CfgFlag::PER_GAME), + ConfigSetting("AnalogSensitivity", &g_Config.fAnalogSensitivity, 1.1f, CfgFlag::PER_GAME), + ConfigSetting("AnalogIsCircular", &g_Config.bAnalogIsCircular, false, CfgFlag::PER_GAME), + ConfigSetting("AnalogAutoRotSpeed", &g_Config.fAnalogAutoRotSpeed, 8.0f, CfgFlag::PER_GAME), - ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.6f, true, true), + ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.6f, CfgFlag::PER_GAME), - ConfigSetting("LeftStickHeadScale", &g_Config.fLeftStickHeadScale, 1.0f, true, true), - ConfigSetting("RightStickHeadScale", &g_Config.fRightStickHeadScale, 1.0f, true, true), - ConfigSetting("HideStickBackground", &g_Config.bHideStickBackground, false, true, true), + ConfigSetting("LeftStickHeadScale", &g_Config.fLeftStickHeadScale, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("RightStickHeadScale", &g_Config.fRightStickHeadScale, 1.0f, CfgFlag::PER_GAME), + ConfigSetting("HideStickBackground", &g_Config.bHideStickBackground, false, CfgFlag::PER_GAME), - ConfigSetting("UseMouse", &g_Config.bMouseControl, false, true, true), - ConfigSetting("MapMouse", &g_Config.bMapMouse, false, true, true), - ConfigSetting("ConfineMap", &g_Config.bMouseConfine, false, true, true), - ConfigSetting("MouseSensitivity", &g_Config.fMouseSensitivity, 0.1f, true, true), - ConfigSetting("MouseSmoothing", &g_Config.fMouseSmoothing, 0.9f, true, true), + ConfigSetting("UseMouse", &g_Config.bMouseControl, false, CfgFlag::PER_GAME), + ConfigSetting("MapMouse", &g_Config.bMapMouse, false, CfgFlag::PER_GAME), + ConfigSetting("ConfineMap", &g_Config.bMouseConfine, false, CfgFlag::PER_GAME), + ConfigSetting("MouseSensitivity", &g_Config.fMouseSensitivity, 0.1f, CfgFlag::PER_GAME), + ConfigSetting("MouseSmoothing", &g_Config.fMouseSmoothing, 0.9f, CfgFlag::PER_GAME), - ConfigSetting("SystemControls", &g_Config.bSystemControls, true, true, false), + ConfigSetting("SystemControls", &g_Config.bSystemControls, true, CfgFlag::DEFAULT), }; static const ConfigSetting networkSettings[] = { - ConfigSetting("EnableWlan", &g_Config.bEnableWlan, false, true, true), - ConfigSetting("EnableAdhocServer", &g_Config.bEnableAdhocServer, false, true, true), - ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "socom.cc", true, true), - ConfigSetting("PortOffset", &g_Config.iPortOffset, 10000, true, true), - ConfigSetting("MinTimeout", &g_Config.iMinTimeout, 0, true, true), - ConfigSetting("ForcedFirstConnect", &g_Config.bForcedFirstConnect, false, true, true), - ConfigSetting("EnableUPnP", &g_Config.bEnableUPnP, false, true, true), - ConfigSetting("UPnPUseOriginalPort", &g_Config.bUPnPUseOriginalPort, false, true, true), + ConfigSetting("EnableWlan", &g_Config.bEnableWlan, false, CfgFlag::PER_GAME), + ConfigSetting("EnableAdhocServer", &g_Config.bEnableAdhocServer, false, CfgFlag::PER_GAME), + ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "socom.cc", CfgFlag::PER_GAME), + ConfigSetting("PortOffset", &g_Config.iPortOffset, 10000, CfgFlag::PER_GAME), + ConfigSetting("MinTimeout", &g_Config.iMinTimeout, 0, CfgFlag::PER_GAME), + ConfigSetting("ForcedFirstConnect", &g_Config.bForcedFirstConnect, false, CfgFlag::PER_GAME), + ConfigSetting("EnableUPnP", &g_Config.bEnableUPnP, false, CfgFlag::PER_GAME), + ConfigSetting("UPnPUseOriginalPort", &g_Config.bUPnPUseOriginalPort, false, CfgFlag::PER_GAME), - ConfigSetting("EnableNetworkChat", &g_Config.bEnableNetworkChat, false, true, true), - ConfigSetting("ChatButtonPosition",&g_Config.iChatButtonPosition,BOTTOM_LEFT,true,true), - ConfigSetting("ChatScreenPosition",&g_Config.iChatScreenPosition,BOTTOM_LEFT,true,true), - ConfigSetting("EnableQuickChat", &g_Config.bEnableQuickChat, true, true, true), - ConfigSetting("QuickChat1", &g_Config.sQuickChat0, "Quick Chat 1", true, true), - ConfigSetting("QuickChat2", &g_Config.sQuickChat1, "Quick Chat 2", true, true), - ConfigSetting("QuickChat3", &g_Config.sQuickChat2, "Quick Chat 3", true, true), - ConfigSetting("QuickChat4", &g_Config.sQuickChat3, "Quick Chat 4", true, true), - ConfigSetting("QuickChat5", &g_Config.sQuickChat4, "Quick Chat 5", true, true), + ConfigSetting("EnableNetworkChat", &g_Config.bEnableNetworkChat, false, CfgFlag::PER_GAME), + ConfigSetting("ChatButtonPosition",&g_Config.iChatButtonPosition,BOTTOM_LEFT, CfgFlag::PER_GAME), + ConfigSetting("ChatScreenPosition",&g_Config.iChatScreenPosition,BOTTOM_LEFT, CfgFlag::PER_GAME), + ConfigSetting("EnableQuickChat", &g_Config.bEnableQuickChat, true, CfgFlag::PER_GAME), + ConfigSetting("QuickChat1", &g_Config.sQuickChat0, "Quick Chat 1", CfgFlag::PER_GAME), + ConfigSetting("QuickChat2", &g_Config.sQuickChat1, "Quick Chat 2", CfgFlag::PER_GAME), + ConfigSetting("QuickChat3", &g_Config.sQuickChat2, "Quick Chat 3", CfgFlag::PER_GAME), + ConfigSetting("QuickChat4", &g_Config.sQuickChat3, "Quick Chat 4", CfgFlag::PER_GAME), + ConfigSetting("QuickChat5", &g_Config.sQuickChat4, "Quick Chat 5", CfgFlag::PER_GAME), }; static int DefaultSystemParamLanguage() { @@ -730,88 +730,88 @@ static int DefaultSystemParamLanguage() { } static const ConfigSetting systemParamSettings[] = { - ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, PSP_MODEL_SLIM, true, true), - ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, true, true), - ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP", true, true), - ConfigSetting("MacAddress", &g_Config.sMACAddress, "", true, true), - ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage, true, true), - ConfigSetting("ParamTimeFormat", &g_Config.iTimeFormat, PSP_SYSTEMPARAM_TIME_FORMAT_24HR, true, true), - ConfigSetting("ParamDateFormat", &g_Config.iDateFormat, PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD, true, true), - ConfigSetting("TimeZone", &g_Config.iTimeZone, 0, true, true), - ConfigSetting("DayLightSavings", &g_Config.bDayLightSavings, (bool) PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_STD, true, true), - ReportedConfigSetting("ButtonPreference", &g_Config.iButtonPreference, PSP_SYSTEMPARAM_BUTTON_CROSS, true, true), - ConfigSetting("LockParentalLevel", &g_Config.iLockParentalLevel, 0, true, true), - ConfigSetting("WlanAdhocChannel", &g_Config.iWlanAdhocChannel, PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC, true, true), + ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, PSP_MODEL_SLIM, CfgFlag::PER_GAME), + ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, CfgFlag::PER_GAME), + ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP", CfgFlag::PER_GAME), + ConfigSetting("MacAddress", &g_Config.sMACAddress, "", CfgFlag::PER_GAME), + ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage, CfgFlag::PER_GAME), + ConfigSetting("ParamTimeFormat", &g_Config.iTimeFormat, PSP_SYSTEMPARAM_TIME_FORMAT_24HR, CfgFlag::PER_GAME), + ConfigSetting("ParamDateFormat", &g_Config.iDateFormat, PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD, CfgFlag::PER_GAME), + ConfigSetting("TimeZone", &g_Config.iTimeZone, 0, CfgFlag::PER_GAME), + ConfigSetting("DayLightSavings", &g_Config.bDayLightSavings, (bool) PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_STD, CfgFlag::PER_GAME), + ReportedConfigSetting("ButtonPreference", &g_Config.iButtonPreference, PSP_SYSTEMPARAM_BUTTON_CROSS, CfgFlag::PER_GAME), + ConfigSetting("LockParentalLevel", &g_Config.iLockParentalLevel, 0, CfgFlag::PER_GAME), + ConfigSetting("WlanAdhocChannel", &g_Config.iWlanAdhocChannel, PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC, CfgFlag::PER_GAME), #if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) - ConfigSetting("BypassOSKWithKeyboard", &g_Config.bBypassOSKWithKeyboard, false, true, true), + ConfigSetting("BypassOSKWithKeyboard", &g_Config.bBypassOSKWithKeyboard, false, CfgFlag::PER_GAME), #endif - ConfigSetting("WlanPowerSave", &g_Config.bWlanPowerSave, (bool) PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF, true, true), - ReportedConfigSetting("EncryptSave", &g_Config.bEncryptSave, true, true, true), - ConfigSetting("SavedataUpgradeVersion", &g_Config.bSavedataUpgrade, true, true, false), - ConfigSetting("MemStickSize", &g_Config.iMemStickSizeGB, 16, true, false), + ConfigSetting("WlanPowerSave", &g_Config.bWlanPowerSave, (bool) PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF, CfgFlag::PER_GAME), + ReportedConfigSetting("EncryptSave", &g_Config.bEncryptSave, true, CfgFlag::PER_GAME), + ConfigSetting("SavedataUpgradeVersion", &g_Config.bSavedataUpgrade, true, CfgFlag::DEFAULT), + ConfigSetting("MemStickSize", &g_Config.iMemStickSizeGB, 16, CfgFlag::DEFAULT), }; static const ConfigSetting debuggerSettings[] = { - ConfigSetting("DisasmWindowX", &g_Config.iDisasmWindowX, -1, true, false), - ConfigSetting("DisasmWindowY", &g_Config.iDisasmWindowY, -1, true, false), - ConfigSetting("DisasmWindowW", &g_Config.iDisasmWindowW, -1, true, false), - ConfigSetting("DisasmWindowH", &g_Config.iDisasmWindowH, -1, true, false), - ConfigSetting("GEWindowX", &g_Config.iGEWindowX, -1, true, false), - ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1, true, false), - ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1, true, false), - ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1, true, false), - ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0, true, false), - ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0, true, false), - ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0, true, false), - ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1, true, false), - ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1, true, false), - ConfigSetting("FontWidth", &g_Config.iFontWidth, 8, true, false), - ConfigSetting("FontHeight", &g_Config.iFontHeight, 12, true, false), - ConfigSetting("DisplayStatusBar", &g_Config.bDisplayStatusBar, true, true, false), - ConfigSetting("ShowBottomTabTitles",&g_Config.bShowBottomTabTitles, true, true, false), - ConfigSetting("ShowDeveloperMenu", &g_Config.bShowDeveloperMenu, false, true, false), - ConfigSetting("ShowAllocatorDebug", &g_Config.bShowAllocatorDebug, false, false, false), - ConfigSetting("ShowGpuProfile", &g_Config.bShowGpuProfile, false, false, false), - ConfigSetting("SkipDeadbeefFilling", &g_Config.bSkipDeadbeefFilling, false, true, false), - ConfigSetting("FuncHashMap", &g_Config.bFuncHashMap, false, true, false), - ConfigSetting("MemInfoDetailed", &g_Config.bDebugMemInfoDetailed, false, true, false), - ConfigSetting("DrawFrameGraph", &g_Config.bDrawFrameGraph, false, true, false), + ConfigSetting("DisasmWindowX", &g_Config.iDisasmWindowX, -1, CfgFlag::DEFAULT), + ConfigSetting("DisasmWindowY", &g_Config.iDisasmWindowY, -1, CfgFlag::DEFAULT), + ConfigSetting("DisasmWindowW", &g_Config.iDisasmWindowW, -1, CfgFlag::DEFAULT), + ConfigSetting("DisasmWindowH", &g_Config.iDisasmWindowH, -1, CfgFlag::DEFAULT), + ConfigSetting("GEWindowX", &g_Config.iGEWindowX, -1, CfgFlag::DEFAULT), + ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1, CfgFlag::DEFAULT), + ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1, CfgFlag::DEFAULT), + ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1, CfgFlag::DEFAULT), + ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0, CfgFlag::DEFAULT), + ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0, CfgFlag::DEFAULT), + ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0, CfgFlag::DEFAULT), + ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1, CfgFlag::DEFAULT), + ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1, CfgFlag::DEFAULT), + ConfigSetting("FontWidth", &g_Config.iFontWidth, 8, CfgFlag::DEFAULT), + ConfigSetting("FontHeight", &g_Config.iFontHeight, 12, CfgFlag::DEFAULT), + ConfigSetting("DisplayStatusBar", &g_Config.bDisplayStatusBar, true, CfgFlag::DEFAULT), + ConfigSetting("ShowBottomTabTitles",&g_Config.bShowBottomTabTitles, true, CfgFlag::DEFAULT), + ConfigSetting("ShowDeveloperMenu", &g_Config.bShowDeveloperMenu, false, CfgFlag::DEFAULT), + ConfigSetting("ShowAllocatorDebug", &g_Config.bShowAllocatorDebug, false, CfgFlag::DONT_SAVE), + ConfigSetting("ShowGpuProfile", &g_Config.bShowGpuProfile, false, CfgFlag::DONT_SAVE), + ConfigSetting("SkipDeadbeefFilling", &g_Config.bSkipDeadbeefFilling, false, CfgFlag::DEFAULT), + ConfigSetting("FuncHashMap", &g_Config.bFuncHashMap, false, CfgFlag::DEFAULT), + ConfigSetting("MemInfoDetailed", &g_Config.bDebugMemInfoDetailed, false, CfgFlag::DEFAULT), + ConfigSetting("DrawFrameGraph", &g_Config.bDrawFrameGraph, false, CfgFlag::DEFAULT), }; static const ConfigSetting jitSettings[] = { - ReportedConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, false, false), + ReportedConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, CfgFlag::DONT_SAVE), }; static const ConfigSetting upgradeSettings[] = { - ConfigSetting("UpgradeMessage", &g_Config.upgradeMessage, "", true, false), - ConfigSetting("UpgradeVersion", &g_Config.upgradeVersion, "", true, false), - ConfigSetting("DismissedVersion", &g_Config.dismissedVersion, "", true, false), + ConfigSetting("UpgradeMessage", &g_Config.upgradeMessage, "", CfgFlag::DEFAULT), + ConfigSetting("UpgradeVersion", &g_Config.upgradeVersion, "", CfgFlag::DEFAULT), + ConfigSetting("DismissedVersion", &g_Config.dismissedVersion, "", CfgFlag::DEFAULT), }; static const ConfigSetting themeSettings[] = { - ConfigSetting("ThemeName", &g_Config.sThemeName, "Default", true, false), + ConfigSetting("ThemeName", &g_Config.sThemeName, "Default", CfgFlag::DEFAULT), }; static const ConfigSetting vrSettings[] = { - ConfigSetting("VREnable", &g_Config.bEnableVR, true, true, false), - ConfigSetting("VREnable6DoF", &g_Config.bEnable6DoF, true, true, false), - ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, false, true, false), - ConfigSetting("VREnableMotions", &g_Config.bEnableMotions, true, true, false), - ConfigSetting("VRForce72Hz", &g_Config.bForce72Hz, true, true, false), - ConfigSetting("VRManualForceVR", &g_Config.bManualForceVR, false, true, false), - ConfigSetting("VRRescaleHUD", &g_Config.bRescaleHUD, true, true, false), - ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f, true, false), - ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f, true, false), - ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f, true, false), - ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0, true, false), - ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f, true, false), - ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f, true, false), - ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f, true, false), - ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f, true, false), - ConfigSetting("VRHeadRotationScale", &g_Config.fHeadRotationScale, 5.0f, true, false), - ConfigSetting("VRHeadRotationEnabled", &g_Config.bHeadRotationEnabled, false, true, false), - ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false, true, false), + ConfigSetting("VREnable", &g_Config.bEnableVR, true, CfgFlag::DEFAULT), + ConfigSetting("VREnable6DoF", &g_Config.bEnable6DoF, true, CfgFlag::DEFAULT), + ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, false, CfgFlag::DEFAULT), + ConfigSetting("VREnableMotions", &g_Config.bEnableMotions, true, CfgFlag::DEFAULT), + ConfigSetting("VRForce72Hz", &g_Config.bForce72Hz, true, CfgFlag::DEFAULT), + ConfigSetting("VRManualForceVR", &g_Config.bManualForceVR, false, CfgFlag::DEFAULT), + ConfigSetting("VRRescaleHUD", &g_Config.bRescaleHUD, true, CfgFlag::DEFAULT), + ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f, CfgFlag::DEFAULT), + ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f, CfgFlag::DEFAULT), + ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f, CfgFlag::DEFAULT), + ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0, CfgFlag::DEFAULT), + ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f, CfgFlag::DEFAULT), + ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f, CfgFlag::DEFAULT), + ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f, CfgFlag::DEFAULT), + ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f, CfgFlag::DEFAULT), + ConfigSetting("VRHeadRotationScale", &g_Config.fHeadRotationScale, 5.0f, CfgFlag::DEFAULT), + ConfigSetting("VRHeadRotationEnabled", &g_Config.bHeadRotationEnabled, false, CfgFlag::DEFAULT), + ConfigSetting("VRHeadRotationSmoothing", &g_Config.bHeadRotationSmoothing, false, CfgFlag::DEFAULT), }; static const ConfigSectionSettings sections[] = { @@ -1141,7 +1141,7 @@ bool Config::Save(const char *saveReason) { bFirstRun = false; IterateSettings(iniFile, [&](Section *section, const ConfigSetting &setting) { - if (!bGameSpecific || !setting.perGame_) { + if (!bGameSpecific || !setting.PerGame()) { setting.Set(section); } }); @@ -1532,7 +1532,7 @@ bool Config::saveGameConfig(const std::string &pGameId, const std::string &title PreSaveCleanup(true); IterateSettings(iniFile, [](Section *section, const ConfigSetting &setting) { - if (setting.perGame_) { + if (setting.PerGame()) { setting.Set(section); } }); @@ -1589,7 +1589,7 @@ bool Config::loadGameConfig(const std::string &pGameId, const std::string &title } IterateSettings(iniFile, [](Section *section, const ConfigSetting &setting) { - if (setting.perGame_) { + if (setting.PerGame()) { setting.Get(section); } }); @@ -1616,7 +1616,7 @@ void Config::unloadGameConfig() { // Reload game specific settings back to standard. IterateSettings(iniFile, [](Section *section, const ConfigSetting &setting) { - if (setting.perGame_) { + if (setting.PerGame()) { setting.Get(section); } }); diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp index c9812d286f..5ece7f1be3 100644 --- a/Core/ConfigSettings.cpp +++ b/Core/ConfigSettings.cpp @@ -66,7 +66,7 @@ bool ConfigSetting::Get(const Section *section) const { } void ConfigSetting::Set(Section *section) const { - if (!save_) { + if (!SaveSetting()) { return; } diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h index 5dea999412..07997402fe 100644 --- a/Core/ConfigSettings.h +++ b/Core/ConfigSettings.h @@ -8,6 +8,13 @@ class Path; class Section; // ini file section struct UrlEncoder; +enum class CfgFlag : u8 { + DEFAULT = 0, + DONT_SAVE = 1, // normally don't like negative flags, but these are really not many. + PER_GAME = 2, +}; +ENUM_CLASS_BITOPS(CfgFlag); + struct ConfigSetting { enum Type { TYPE_TERMINATOR, @@ -66,114 +73,114 @@ struct ConfigSetting { CustomButtonDefaultCallback customButton; }; - ConfigSetting(const char *ini, bool *v, bool def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, bool *v, bool def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_BOOL), flags_(flags) { ptr_.b = v; cb_.b = nullptr; default_.b = def; } - ConfigSetting(const char *ini, int *v, int def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, int *v, int def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_INT), flags_(flags) { ptr_.i = v; cb_.i = nullptr; default_.i = def; } - ConfigSetting(const char *ini, int *v, int def, std::string(*transTo)(int), int (*transFrom)(const std::string &), bool save, bool perGame) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { + ConfigSetting(const char *ini, int *v, int def, std::string(*transTo)(int), int (*transFrom)(const std::string &), CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_INT), flags_(flags), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = nullptr; default_.i = def; } - ConfigSetting(const char *ini, uint32_t *v, uint32_t def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, uint32_t *v, uint32_t def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_UINT32), flags_(flags) { ptr_.u = v; cb_.u = nullptr; default_.u = def; } - ConfigSetting(const char *ini, uint64_t *v, uint64_t def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_UINT64), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, uint64_t *v, uint64_t def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_UINT64), flags_(flags) { ptr_.lu = v; cb_.lu = nullptr; default_.lu = def; } - ConfigSetting(const char *ini, float *v, float def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, float *v, float def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_FLOAT), flags_(flags) { ptr_.f = v; cb_.f = nullptr; default_.f = def; } - ConfigSetting(const char *ini, std::string *v, const char *def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, std::string *v, const char *def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_STRING), flags_(flags) { ptr_.s = v; cb_.s = nullptr; default_.s = def; } - ConfigSetting(const char *ini, Path *p, const char *def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_PATH), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, Path *p, const char *def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_PATH), flags_(flags) { ptr_.p = p; cb_.p = nullptr; default_.p = def; } - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, bool save, bool perGame) - : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, ConfigTouchPos def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), flags_(flags) { ptr_.touchPos = v; cb_.touchPos = nullptr; default_.touchPos = def; } - ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, bool save, bool perGame) - : iniKey_(iniKey), ini2_(iniImage), ini3_(iniShape), ini4_(iniToggle), ini5_(iniRepeat), type_(TYPE_CUSTOM_BUTTON), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *iniKey, const char *iniImage, const char *iniShape, const char *iniToggle, const char *iniRepeat, ConfigCustomButton *v, ConfigCustomButton def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(iniKey), ini2_(iniImage), ini3_(iniShape), ini4_(iniToggle), ini5_(iniRepeat), type_(TYPE_CUSTOM_BUTTON), flags_(flags) { ptr_.customButton = v; cb_.customButton = nullptr; default_.customButton = def; } - ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_BOOL), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, bool *v, BoolDefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_BOOL), flags_(flags) { ptr_.b = v; cb_.b = def; } - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_INT), flags_(flags) { ptr_.i = v; cb_.i = def; } - ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save, bool perGame) - : iniKey_(ini), type_(TYPE_INT), report_(false), save_(save), perGame_(perGame), translateTo_(transTo), translateFrom_(transFrom) { + ConfigSetting(const char *ini, int *v, IntDefaultCallback def, std::string(*transTo)(int), int(*transFrom)(const std::string &), CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_INT), flags_(flags), translateTo_(transTo), translateFrom_(transFrom) { ptr_.i = v; cb_.i = def; } - ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_UINT32), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, uint32_t *v, Uint32DefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_UINT32), flags_(flags) { ptr_.u = v; cb_.u = def; } - ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_FLOAT), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, float *v, FloatDefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_FLOAT), flags_(flags) { ptr_.f = v; cb_.f = def; } - ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, bool save, bool perGame) - : iniKey_(ini), type_(TYPE_STRING), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *ini, std::string *v, StringDefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(ini), type_(TYPE_STRING), flags_(flags) { ptr_.s = v; cb_.s = def; } - ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, bool save, bool perGame) - : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), report_(false), save_(save), perGame_(perGame) { + ConfigSetting(const char *iniX, const char *iniY, const char *iniScale, const char *iniShow, ConfigTouchPos *v, TouchPosDefaultCallback def, CfgFlag flags = CfgFlag::DEFAULT) + : iniKey_(iniX), ini2_(iniY), ini3_(iniScale), ini4_(iniShow), type_(TYPE_TOUCH_POS), flags_(flags) { ptr_.touchPos = v; cb_.touchPos = def; } @@ -189,6 +196,11 @@ struct ConfigSetting { void Report(UrlEncoder &data, const std::string &prefix) const; + // Easy flag accessors. + bool PerGame() const { return flags_ & CfgFlag::PER_GAME; } + bool SaveSetting() const { return !(flags_ & CfgFlag::DONT_SAVE); } + bool Report() const { return report_; } + const char *iniKey_ = nullptr; const char *ini2_ = nullptr; const char *ini3_ = nullptr; @@ -197,30 +209,18 @@ struct ConfigSetting { const Type type_; - bool report_; - const bool save_; - const bool perGame_; +protected: + bool report_ = false; + +private: + CfgFlag flags_; SettingPtr ptr_; DefaultValue default_{}; DefaultCallback cb_; // We only support transform for ints. - std::string(*translateTo_)(int) = nullptr; - int(*translateFrom_)(const std::string &) = nullptr; -}; - -struct ReportedConfigSetting : public ConfigSetting { - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, bool save, bool perGame) - : ConfigSetting(ini, v, def, save, perGame) { - report_ = true; - } - - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string(*transTo)(int), int(*transFrom)(const std::string &), bool save, bool perGame) - : ConfigSetting(ini, v, def, transTo, transFrom, save, perGame) { - report_ = true; - } + std::string (*translateTo_)(int) = nullptr; + int (*translateFrom_)(const std::string &) = nullptr; }; struct ConfigSectionSettings { @@ -228,3 +228,20 @@ struct ConfigSectionSettings { const ConfigSetting *settings; size_t settingsCount; }; + +struct ReportedConfigSetting : public ConfigSetting { + template + ReportedConfigSetting(const char *ini, T1 *v, T2 def, CfgFlag flags = CfgFlag::DEFAULT) + : ConfigSetting(ini, v, def, flags) { + report_ = true; + } + + template + ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string (*transTo)(int), int (*transFrom)(const std::string &), CfgFlag flags = CfgFlag::DEFAULT) + : ConfigSetting(ini, v, def, transTo, transFrom, flags) { + report_ = true; + } + + std::string(*translateTo_)(int) = nullptr; + int (*translateFrom_)(const std::string &) = nullptr; +}; From 88a209a3429abe9af09084ef71445b9839c8544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Apr 2023 16:27:44 +0200 Subject: [PATCH 7/7] Move the report bool into the flags field --- Core/Config.cpp | 76 ++++++++++++++++++++--------------------- Core/ConfigSettings.cpp | 4 +-- Core/ConfigSettings.h | 25 ++------------ 3 files changed, 43 insertions(+), 62 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index e07c9d0bf3..5455fe3f10 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -174,7 +174,7 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("UISound", &g_Config.bUISound, false, CfgFlag::DEFAULT), ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, CfgFlag::PER_GAME), - ReportedConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, CfgFlag::PER_GAME), + ConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshRate, 77, CfgFlag::PER_GAME), ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, CfgFlag::PER_GAME), ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, CfgFlag::DEFAULT), @@ -254,10 +254,10 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("FullscreenOnDoubleclick", &g_Config.bFullscreenOnDoubleclick, true, CfgFlag::DONT_SAVE), ConfigSetting("ShowMenuBar", &g_Config.bShowMenuBar, true, CfgFlag::DEFAULT), - ReportedConfigSetting("MemStickInserted", &g_Config.bMemStickInserted, true, CfgFlag::PER_GAME), + ConfigSetting("MemStickInserted", &g_Config.bMemStickInserted, true, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("EnablePlugins", &g_Config.bLoadPlugins, true, CfgFlag::PER_GAME), - ReportedConfigSetting("IgnoreCompatSettings", &g_Config.sIgnoreCompatSettings, "", CfgFlag::PER_GAME), + ConfigSetting("IgnoreCompatSettings", &g_Config.sIgnoreCompatSettings, "", CfgFlag::PER_GAME | CfgFlag::REPORT), }; static bool DefaultSasThread() { @@ -265,16 +265,16 @@ static bool DefaultSasThread() { } static const ConfigSetting cpuSettings[] = { - ReportedConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, CfgFlag::PER_GAME), - ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, CfgFlag::PER_GAME), - ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, CfgFlag::PER_GAME), + ConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, CfgFlag::PER_GAME), - ReportedConfigSetting("FunctionReplacements", &g_Config.bFuncReplacements, true, CfgFlag::PER_GAME), + ConfigSetting("FunctionReplacements", &g_Config.bFuncReplacements, true, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("HideSlowWarnings", &g_Config.bHideSlowWarnings, false, CfgFlag::DEFAULT), ConfigSetting("HideStateWarnings", &g_Config.bHideStateWarnings, false, CfgFlag::DEFAULT), ConfigSetting("PreloadFunctions", &g_Config.bPreloadFunctions, false, CfgFlag::PER_GAME), ConfigSetting("JitDisableFlags", &g_Config.uJitDisableFlags, (uint32_t)0, CfgFlag::PER_GAME), - ReportedConfigSetting("CPUSpeed", &g_Config.iLockedCPUSpeed, 0, CfgFlag::PER_GAME), + ConfigSetting("CPUSpeed", &g_Config.iLockedCPUSpeed, 0, CfgFlag::PER_GAME | CfgFlag::REPORT), }; static int DefaultInternalResolution() { @@ -474,7 +474,7 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("CardboardXShift", &g_Config.iCardboardXShift, 0, CfgFlag::PER_GAME), ConfigSetting("CardboardYShift", &g_Config.iCardboardYShift, 0, CfgFlag::PER_GAME), ConfigSetting("iShowStatusFlags", &g_Config.iShowStatusFlags, 0, CfgFlag::PER_GAME), - ReportedConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, CfgFlag::DEFAULT), + ConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, CfgFlag::DEFAULT | CfgFlag::REPORT), ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, "", CfgFlag::DEFAULT), ConfigSetting("DisabledGraphicsBackends", &g_Config.sDisabledGPUBackends, "", CfgFlag::DEFAULT), ConfigSetting("VulkanDevice", &g_Config.sVulkanDevice, "", CfgFlag::DEFAULT), @@ -484,17 +484,17 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("CameraDevice", &g_Config.sCameraDevice, "", CfgFlag::DEFAULT), ConfigSetting("VendorBugChecksEnabled", &g_Config.bVendorBugChecksEnabled, true, CfgFlag::DONT_SAVE), ConfigSetting("UseGeometryShader", &g_Config.bUseGeometryShader, false, CfgFlag::PER_GAME), - ReportedConfigSetting("SkipBufferEffects", &g_Config.bSkipBufferEffects, false, CfgFlag::PER_GAME), + ConfigSetting("SkipBufferEffects", &g_Config.bSkipBufferEffects, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("SoftwareRenderer", &g_Config.bSoftwareRendering, false, CfgFlag::PER_GAME), ConfigSetting("SoftwareRendererJit", &g_Config.bSoftwareRenderingJit, true, CfgFlag::PER_GAME), - ReportedConfigSetting("HardwareTransform", &g_Config.bHardwareTransform, true, CfgFlag::PER_GAME), - ReportedConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, CfgFlag::PER_GAME), - ReportedConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, CfgFlag::PER_GAME), - ReportedConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, CfgFlag::PER_GAME), - ReportedConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, CfgFlag::PER_GAME), - ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, CfgFlag::PER_GAME), - ReportedConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, CfgFlag::PER_GAME), - ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), CfgFlag::PER_GAME), + ConfigSetting("HardwareTransform", &g_Config.bHardwareTransform, true, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("StereoRendering", &g_Config.bStereoRendering, false, CfgFlag::PER_GAME), ConfigSetting("StereoToMonoShader", &g_Config.sStereoToMonoShader, "RedBlue", CfgFlag::PER_GAME), ConfigSetting("FrameRate", &g_Config.iFpsLimit1, 0, CfgFlag::PER_GAME), @@ -509,9 +509,9 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, CfgFlag::PER_GAME), ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, CfgFlag::PER_GAME), // Number of samples is 1 << iMultiSampleLevel - ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, CfgFlag::PER_GAME), - ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, CfgFlag::PER_GAME), - ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, CfgFlag::DONT_SAVE), + ConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, CfgFlag::DONT_SAVE | CfgFlag::REPORT), #ifndef MOBILE_DEVICE ConfigSetting("FullScreen", &g_Config.bFullScreen, false, CfgFlag::DEFAULT), @@ -530,24 +530,24 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("SustainedPerformanceMode", &g_Config.bSustainedPerformanceMode, false, CfgFlag::PER_GAME), ConfigSetting("IgnoreScreenInsets", &g_Config.bIgnoreScreenInsets, true, CfgFlag::DEFAULT), - ReportedConfigSetting("ReplaceTextures", &g_Config.bReplaceTextures, true, CfgFlag::PER_GAME), - ReportedConfigSetting("SaveNewTextures", &g_Config.bSaveNewTextures, false, CfgFlag::PER_GAME), + ConfigSetting("ReplaceTextures", &g_Config.bReplaceTextures, true, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("SaveNewTextures", &g_Config.bSaveNewTextures, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("IgnoreTextureFilenames", &g_Config.bIgnoreTextureFilenames, false, CfgFlag::PER_GAME), - ReportedConfigSetting("TexScalingLevel", &g_Config.iTexScalingLevel, 1, CfgFlag::PER_GAME), - ReportedConfigSetting("TexScalingType", &g_Config.iTexScalingType, 0, CfgFlag::PER_GAME), - ReportedConfigSetting("TexDeposterize", &g_Config.bTexDeposterize, false, CfgFlag::PER_GAME), - ReportedConfigSetting("TexHardwareScaling", &g_Config.bTexHardwareScaling, false, CfgFlag::PER_GAME), + ConfigSetting("TexScalingLevel", &g_Config.iTexScalingLevel, 1, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("TexScalingType", &g_Config.iTexScalingType, 0, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("TexDeposterize", &g_Config.bTexDeposterize, false, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("TexHardwareScaling", &g_Config.bTexHardwareScaling, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("VSyncInterval", &g_Config.bVSync, false, CfgFlag::PER_GAME), - ReportedConfigSetting("BloomHack", &g_Config.iBloomHack, 0, CfgFlag::PER_GAME), + ConfigSetting("BloomHack", &g_Config.iBloomHack, 0, CfgFlag::PER_GAME | CfgFlag::REPORT), // Not really a graphics setting... - ReportedConfigSetting("SplineBezierQuality", &g_Config.iSplineBezierQuality, 2, CfgFlag::PER_GAME), - ReportedConfigSetting("HardwareTessellation", &g_Config.bHardwareTessellation, false, CfgFlag::PER_GAME), + ConfigSetting("SplineBezierQuality", &g_Config.iSplineBezierQuality, 2, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("HardwareTessellation", &g_Config.bHardwareTessellation, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("TextureShader", &g_Config.sTextureShaderName, "Off", CfgFlag::PER_GAME), ConfigSetting("ShaderChainRequires60FPS", &g_Config.bShaderChainRequires60FPS, false, CfgFlag::PER_GAME), - ReportedConfigSetting("SkipGPUReadbacks", &g_Config.bSkipGPUReadbacks, false, CfgFlag::PER_GAME), + ConfigSetting("SkipGPUReadbacks", &g_Config.bSkipGPUReadbacks, false, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, CfgFlag::DONT_SAVE), ConfigSetting("LogFrameDrops", &g_Config.bLogFrameDrops, false, CfgFlag::DEFAULT), @@ -730,23 +730,23 @@ static int DefaultSystemParamLanguage() { } static const ConfigSetting systemParamSettings[] = { - ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, PSP_MODEL_SLIM, CfgFlag::PER_GAME), - ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, CfgFlag::PER_GAME), + ConfigSetting("PSPModel", &g_Config.iPSPModel, PSP_MODEL_SLIM, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP", CfgFlag::PER_GAME), ConfigSetting("MacAddress", &g_Config.sMACAddress, "", CfgFlag::PER_GAME), - ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage, CfgFlag::PER_GAME), + ConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("ParamTimeFormat", &g_Config.iTimeFormat, PSP_SYSTEMPARAM_TIME_FORMAT_24HR, CfgFlag::PER_GAME), ConfigSetting("ParamDateFormat", &g_Config.iDateFormat, PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD, CfgFlag::PER_GAME), ConfigSetting("TimeZone", &g_Config.iTimeZone, 0, CfgFlag::PER_GAME), ConfigSetting("DayLightSavings", &g_Config.bDayLightSavings, (bool) PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_STD, CfgFlag::PER_GAME), - ReportedConfigSetting("ButtonPreference", &g_Config.iButtonPreference, PSP_SYSTEMPARAM_BUTTON_CROSS, CfgFlag::PER_GAME), + ConfigSetting("ButtonPreference", &g_Config.iButtonPreference, PSP_SYSTEMPARAM_BUTTON_CROSS, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("LockParentalLevel", &g_Config.iLockParentalLevel, 0, CfgFlag::PER_GAME), ConfigSetting("WlanAdhocChannel", &g_Config.iWlanAdhocChannel, PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC, CfgFlag::PER_GAME), #if defined(USING_WIN_UI) || defined(USING_QT_UI) || PPSSPP_PLATFORM(ANDROID) ConfigSetting("BypassOSKWithKeyboard", &g_Config.bBypassOSKWithKeyboard, false, CfgFlag::PER_GAME), #endif ConfigSetting("WlanPowerSave", &g_Config.bWlanPowerSave, (bool) PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF, CfgFlag::PER_GAME), - ReportedConfigSetting("EncryptSave", &g_Config.bEncryptSave, true, CfgFlag::PER_GAME), + ConfigSetting("EncryptSave", &g_Config.bEncryptSave, true, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("SavedataUpgradeVersion", &g_Config.bSavedataUpgrade, true, CfgFlag::DEFAULT), ConfigSetting("MemStickSize", &g_Config.iMemStickSizeGB, 16, CfgFlag::DEFAULT), }; @@ -779,7 +779,7 @@ static const ConfigSetting debuggerSettings[] = { }; static const ConfigSetting jitSettings[] = { - ReportedConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, CfgFlag::DONT_SAVE), + ConfigSetting("DiscardRegsOnJRRA", &g_Config.bDiscardRegsOnJRRA, false, CfgFlag::DONT_SAVE | CfgFlag::REPORT), }; static const ConfigSetting upgradeSettings[] = { @@ -1685,7 +1685,7 @@ void Config::GetReportingInfo(UrlEncoder &data) { for (size_t i = 0; i < numSections; ++i) { const std::string prefix = std::string("config.") + sections[i].section; for (size_t j = 0; j < sections[i].settingsCount; j++) { - sections[i].settings[j].Report(data, prefix); + sections[i].settings[j].ReportSetting(data, prefix); } } } diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp index 5ece7f1be3..49bc12f486 100644 --- a/Core/ConfigSettings.cpp +++ b/Core/ConfigSettings.cpp @@ -126,8 +126,8 @@ void ConfigSetting::RestoreToDefault() const { } } -void ConfigSetting::Report(UrlEncoder &data, const std::string &prefix) const { - if (!report_) +void ConfigSetting::ReportSetting(UrlEncoder &data, const std::string &prefix) const { + if (!Report()) return; switch (type_) { diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h index 07997402fe..6d6ce2864c 100644 --- a/Core/ConfigSettings.h +++ b/Core/ConfigSettings.h @@ -12,6 +12,7 @@ enum class CfgFlag : u8 { DEFAULT = 0, DONT_SAVE = 1, // normally don't like negative flags, but these are really not many. PER_GAME = 2, + REPORT = 4, }; ENUM_CLASS_BITOPS(CfgFlag); @@ -194,12 +195,12 @@ struct ConfigSetting { void RestoreToDefault() const; - void Report(UrlEncoder &data, const std::string &prefix) const; + void ReportSetting(UrlEncoder &data, const std::string &prefix) const; // Easy flag accessors. bool PerGame() const { return flags_ & CfgFlag::PER_GAME; } bool SaveSetting() const { return !(flags_ & CfgFlag::DONT_SAVE); } - bool Report() const { return report_; } + bool Report() const { return flags_ & CfgFlag::REPORT; } const char *iniKey_ = nullptr; const char *ini2_ = nullptr; @@ -209,9 +210,6 @@ struct ConfigSetting { const Type type_; -protected: - bool report_ = false; - private: CfgFlag flags_; SettingPtr ptr_; @@ -228,20 +226,3 @@ struct ConfigSectionSettings { const ConfigSetting *settings; size_t settingsCount; }; - -struct ReportedConfigSetting : public ConfigSetting { - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, CfgFlag flags = CfgFlag::DEFAULT) - : ConfigSetting(ini, v, def, flags) { - report_ = true; - } - - template - ReportedConfigSetting(const char *ini, T1 *v, T2 def, std::string (*transTo)(int), int (*transFrom)(const std::string &), CfgFlag flags = CfgFlag::DEFAULT) - : ConfigSetting(ini, v, def, transTo, transFrom, flags) { - report_ = true; - } - - std::string(*translateTo_)(int) = nullptr; - int (*translateFrom_)(const std::string &) = nullptr; -};