summaryrefslogtreecommitdiffstats
path: root/src/common/settings.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-04-15 02:47:18 +0200
committerGitHub <noreply@github.com>2021-04-15 02:47:18 +0200
commitde5bf640b7309450357074083a9ac397f251adbc (patch)
treee7c9b9845f7751c2cc4a00dbf05798ff2a69490d /src/common/settings.h
parentMerge pull request #6197 from ameerj/kreslimit-cleanup (diff)
parentcommon: Move settings to common from core. (diff)
downloadyuzu-de5bf640b7309450357074083a9ac397f251adbc.tar
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.gz
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.bz2
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.lz
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.xz
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.zst
yuzu-de5bf640b7309450357074083a9ac397f251adbc.zip
Diffstat (limited to '')
-rw-r--r--src/common/settings.h (renamed from src/core/settings.h)15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/core/settings.h b/src/common/settings.h
index 6c03a6ea9..d39b4aa45 100644
--- a/src/core/settings.h
+++ b/src/common/settings.h
@@ -1,4 +1,4 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright 2021 yuzu Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -11,16 +11,13 @@
#include <optional>
#include <string>
#include <vector>
-#include "common/common_types.h"
-#include "input_common/settings.h"
-namespace Core {
-class System;
-}
+#include "common/common_types.h"
+#include "common/settings_input.h"
namespace Settings {
-enum class RendererBackend {
+enum class RendererBackend : u32 {
OpenGL = 0,
Vulkan = 1,
};
@@ -31,7 +28,7 @@ enum class GPUAccuracy : u32 {
Extreme = 2,
};
-enum class CPUAccuracy {
+enum class CPUAccuracy : u32 {
Accurate = 0,
Unsafe = 1,
DebugMode = 2,
@@ -223,6 +220,7 @@ struct Values {
bool quest_flag;
bool disable_macro_jit;
bool extended_logging;
+ bool use_debug_asserts;
bool use_auto_stub;
// Miscellaneous
@@ -255,7 +253,6 @@ float Volume();
std::string GetTimeZoneString();
-void Apply(Core::System& system);
void LogSettings();
// Restore the global state of all applicable settings in the Values struct