diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/common/bounded_threadsafe_queue.h | 4 | ||||
| -rw-r--r-- | src/common/fs/fs.cpp | 15 | ||||
| -rw-r--r-- | src/common/settings.cpp | 10 | ||||
| -rw-r--r-- | src/common/settings.h | 6 | ||||
| -rw-r--r-- | src/common/settings_common.h | 10 | ||||
| -rw-r--r-- | src/common/settings_setting.h | 33 |
7 files changed, 66 insertions, 17 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 34877b461..416203c59 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -26,12 +26,11 @@ add_library(common STATIC | |||
| 26 | assert.h | 26 | assert.h |
| 27 | atomic_helpers.h | 27 | atomic_helpers.h |
| 28 | atomic_ops.h | 28 | atomic_ops.h |
| 29 | detached_tasks.cpp | ||
| 30 | detached_tasks.h | ||
| 31 | bit_cast.h | 29 | bit_cast.h |
| 32 | bit_field.h | 30 | bit_field.h |
| 33 | bit_set.h | 31 | bit_set.h |
| 34 | bit_util.h | 32 | bit_util.h |
| 33 | bounded_threadsafe_queue.h | ||
| 35 | cityhash.cpp | 34 | cityhash.cpp |
| 36 | cityhash.h | 35 | cityhash.h |
| 37 | common_funcs.h | 36 | common_funcs.h |
| @@ -41,6 +40,8 @@ add_library(common STATIC | |||
| 41 | container_hash.h | 40 | container_hash.h |
| 42 | demangle.cpp | 41 | demangle.cpp |
| 43 | demangle.h | 42 | demangle.h |
| 43 | detached_tasks.cpp | ||
| 44 | detached_tasks.h | ||
| 44 | div_ceil.h | 45 | div_ceil.h |
| 45 | dynamic_library.cpp | 46 | dynamic_library.cpp |
| 46 | dynamic_library.h | 47 | dynamic_library.h |
diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index bd87aa09b..b36fc1de9 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h | |||
| @@ -45,13 +45,13 @@ public: | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | T PopWait() { | 47 | T PopWait() { |
| 48 | T t; | 48 | T t{}; |
| 49 | Pop<PopMode::Wait>(t); | 49 | Pop<PopMode::Wait>(t); |
| 50 | return t; | 50 | return t; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | T PopWait(std::stop_token stop_token) { | 53 | T PopWait(std::stop_token stop_token) { |
| 54 | T t; | 54 | T t{}; |
| 55 | Pop<PopMode::WaitWithStopToken>(t, stop_token); | 55 | Pop<PopMode::WaitWithStopToken>(t, stop_token); |
| 56 | return t; | 56 | return t; |
| 57 | } | 57 | } |
diff --git a/src/common/fs/fs.cpp b/src/common/fs/fs.cpp index 36e67c145..174aed49b 100644 --- a/src/common/fs/fs.cpp +++ b/src/common/fs/fs.cpp | |||
| @@ -528,38 +528,41 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path, | |||
| 528 | // Generic Filesystem Operations | 528 | // Generic Filesystem Operations |
| 529 | 529 | ||
| 530 | bool Exists(const fs::path& path) { | 530 | bool Exists(const fs::path& path) { |
| 531 | std::error_code ec; | ||
| 531 | #ifdef ANDROID | 532 | #ifdef ANDROID |
| 532 | if (Android::IsContentUri(path)) { | 533 | if (Android::IsContentUri(path)) { |
| 533 | return Android::Exists(path); | 534 | return Android::Exists(path); |
| 534 | } else { | 535 | } else { |
| 535 | return fs::exists(path); | 536 | return fs::exists(path, ec); |
| 536 | } | 537 | } |
| 537 | #else | 538 | #else |
| 538 | return fs::exists(path); | 539 | return fs::exists(path, ec); |
| 539 | #endif | 540 | #endif |
| 540 | } | 541 | } |
| 541 | 542 | ||
| 542 | bool IsFile(const fs::path& path) { | 543 | bool IsFile(const fs::path& path) { |
| 544 | std::error_code ec; | ||
| 543 | #ifdef ANDROID | 545 | #ifdef ANDROID |
| 544 | if (Android::IsContentUri(path)) { | 546 | if (Android::IsContentUri(path)) { |
| 545 | return !Android::IsDirectory(path); | 547 | return !Android::IsDirectory(path); |
| 546 | } else { | 548 | } else { |
| 547 | return fs::is_regular_file(path); | 549 | return fs::is_regular_file(path, ec); |
| 548 | } | 550 | } |
| 549 | #else | 551 | #else |
| 550 | return fs::is_regular_file(path); | 552 | return fs::is_regular_file(path, ec); |
| 551 | #endif | 553 | #endif |
| 552 | } | 554 | } |
| 553 | 555 | ||
| 554 | bool IsDir(const fs::path& path) { | 556 | bool IsDir(const fs::path& path) { |
| 557 | std::error_code ec; | ||
| 555 | #ifdef ANDROID | 558 | #ifdef ANDROID |
| 556 | if (Android::IsContentUri(path)) { | 559 | if (Android::IsContentUri(path)) { |
| 557 | return Android::IsDirectory(path); | 560 | return Android::IsDirectory(path); |
| 558 | } else { | 561 | } else { |
| 559 | return fs::is_directory(path); | 562 | return fs::is_directory(path, ec); |
| 560 | } | 563 | } |
| 561 | #else | 564 | #else |
| 562 | return fs::is_directory(path); | 565 | return fs::is_directory(path, ec); |
| 563 | #endif | 566 | #endif |
| 564 | } | 567 | } |
| 565 | 568 | ||
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 4ecaf550b..3fde3cae6 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -130,13 +130,17 @@ void LogSettings() { | |||
| 130 | log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); | 130 | log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | void UpdateGPUAccuracy() { | ||
| 134 | values.current_gpu_accuracy = values.gpu_accuracy.GetValue(); | ||
| 135 | } | ||
| 136 | |||
| 133 | bool IsGPULevelExtreme() { | 137 | bool IsGPULevelExtreme() { |
| 134 | return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme; | 138 | return values.current_gpu_accuracy == GpuAccuracy::Extreme; |
| 135 | } | 139 | } |
| 136 | 140 | ||
| 137 | bool IsGPULevelHigh() { | 141 | bool IsGPULevelHigh() { |
| 138 | return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme || | 142 | return values.current_gpu_accuracy == GpuAccuracy::Extreme || |
| 139 | values.gpu_accuracy.GetValue() == GpuAccuracy::High; | 143 | values.current_gpu_accuracy == GpuAccuracy::High; |
| 140 | } | 144 | } |
| 141 | 145 | ||
| 142 | bool IsFastmemEnabled() { | 146 | bool IsFastmemEnabled() { |
diff --git a/src/common/settings.h b/src/common/settings.h index b15213bd7..98ab0ec2e 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -307,6 +307,7 @@ struct Values { | |||
| 307 | Specialization::Default, | 307 | Specialization::Default, |
| 308 | true, | 308 | true, |
| 309 | true}; | 309 | true}; |
| 310 | GpuAccuracy current_gpu_accuracy{GpuAccuracy::High}; | ||
| 310 | SwitchableSetting<AnisotropyMode, true> max_anisotropy{ | 311 | SwitchableSetting<AnisotropyMode, true> max_anisotropy{ |
| 311 | linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16, | 312 | linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16, |
| 312 | "max_anisotropy", Category::RendererAdvanced}; | 313 | "max_anisotropy", Category::RendererAdvanced}; |
| @@ -348,6 +349,10 @@ struct Values { | |||
| 348 | Category::RendererDebug}; | 349 | Category::RendererDebug}; |
| 349 | Setting<bool> disable_shader_loop_safety_checks{ | 350 | Setting<bool> disable_shader_loop_safety_checks{ |
| 350 | linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug}; | 351 | linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug}; |
| 352 | Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey", | ||
| 353 | Category::RendererDebug}; | ||
| 354 | // TODO: remove this once AMDVLK supports VK_EXT_depth_bias_control | ||
| 355 | bool renderer_amdvlk_depth_bias_workaround{}; | ||
| 351 | 356 | ||
| 352 | // System | 357 | // System |
| 353 | SwitchableSetting<Language, true> language_index{linkage, | 358 | SwitchableSetting<Language, true> language_index{linkage, |
| @@ -520,6 +525,7 @@ struct Values { | |||
| 520 | 525 | ||
| 521 | extern Values values; | 526 | extern Values values; |
| 522 | 527 | ||
| 528 | void UpdateGPUAccuracy(); | ||
| 523 | bool IsGPULevelExtreme(); | 529 | bool IsGPULevelExtreme(); |
| 524 | bool IsGPULevelHigh(); | 530 | bool IsGPULevelHigh(); |
| 525 | 531 | ||
diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 5b170dfd5..1800ab10d 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h | |||
| @@ -225,6 +225,16 @@ public: | |||
| 225 | */ | 225 | */ |
| 226 | [[nodiscard]] virtual constexpr u32 EnumIndex() const = 0; | 226 | [[nodiscard]] virtual constexpr u32 EnumIndex() const = 0; |
| 227 | 227 | ||
| 228 | /** | ||
| 229 | * @returns True if the underlying type is a floating point storage | ||
| 230 | */ | ||
| 231 | [[nodiscard]] virtual constexpr bool IsFloatingPoint() const = 0; | ||
| 232 | |||
| 233 | /** | ||
| 234 | * @returns True if the underlying type is an integer storage | ||
| 235 | */ | ||
| 236 | [[nodiscard]] virtual constexpr bool IsIntegral() const = 0; | ||
| 237 | |||
| 228 | /* | 238 | /* |
| 229 | * Switchable settings | 239 | * Switchable settings |
| 230 | */ | 240 | */ |
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h index e10843c73..3175ab07d 100644 --- a/src/common/settings_setting.h +++ b/src/common/settings_setting.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <string> | 10 | #include <string> |
| 11 | #include <typeindex> | 11 | #include <typeindex> |
| 12 | #include <typeinfo> | 12 | #include <typeinfo> |
| 13 | #include <fmt/core.h> | ||
| 13 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 14 | #include "common/settings_common.h" | 15 | #include "common/settings_common.h" |
| 15 | #include "common/settings_enums.h" | 16 | #include "common/settings_enums.h" |
| @@ -115,8 +116,12 @@ protected: | |||
| 115 | } else if constexpr (std::is_same_v<Type, AudioEngine>) { | 116 | } else if constexpr (std::is_same_v<Type, AudioEngine>) { |
| 116 | // Compatibility with old AudioEngine setting being a string | 117 | // Compatibility with old AudioEngine setting being a string |
| 117 | return CanonicalizeEnum(value_); | 118 | return CanonicalizeEnum(value_); |
| 119 | } else if constexpr (std::is_floating_point_v<Type>) { | ||
| 120 | return fmt::format("{:f}", value_); | ||
| 121 | } else if constexpr (std::is_enum_v<Type>) { | ||
| 122 | return std::to_string(static_cast<u32>(value_)); | ||
| 118 | } else { | 123 | } else { |
| 119 | return std::to_string(static_cast<u64>(value_)); | 124 | return std::to_string(value_); |
| 120 | } | 125 | } |
| 121 | } | 126 | } |
| 122 | 127 | ||
| @@ -180,13 +185,17 @@ public: | |||
| 180 | this->SetValue(static_cast<u32>(std::stoul(input))); | 185 | this->SetValue(static_cast<u32>(std::stoul(input))); |
| 181 | } else if constexpr (std::is_same_v<Type, bool>) { | 186 | } else if constexpr (std::is_same_v<Type, bool>) { |
| 182 | this->SetValue(input == "true"); | 187 | this->SetValue(input == "true"); |
| 188 | } else if constexpr (std::is_same_v<Type, float>) { | ||
| 189 | this->SetValue(std::stof(input)); | ||
| 183 | } else if constexpr (std::is_same_v<Type, AudioEngine>) { | 190 | } else if constexpr (std::is_same_v<Type, AudioEngine>) { |
| 184 | this->SetValue(ToEnum<Type>(input)); | 191 | this->SetValue(ToEnum<AudioEngine>(input)); |
| 185 | } else { | 192 | } else { |
| 186 | this->SetValue(static_cast<Type>(std::stoll(input))); | 193 | this->SetValue(static_cast<Type>(std::stoll(input))); |
| 187 | } | 194 | } |
| 188 | } catch (std::invalid_argument&) { | 195 | } catch (std::invalid_argument&) { |
| 189 | this->SetValue(this->GetDefault()); | 196 | this->SetValue(this->GetDefault()); |
| 197 | } catch (std::out_of_range&) { | ||
| 198 | this->SetValue(this->GetDefault()); | ||
| 190 | } | 199 | } |
| 191 | } | 200 | } |
| 192 | 201 | ||
| @@ -215,11 +224,27 @@ public: | |||
| 215 | } | 224 | } |
| 216 | } | 225 | } |
| 217 | 226 | ||
| 227 | [[nodiscard]] constexpr bool IsFloatingPoint() const final { | ||
| 228 | return std::is_floating_point_v<Type>; | ||
| 229 | } | ||
| 230 | |||
| 231 | [[nodiscard]] constexpr bool IsIntegral() const final { | ||
| 232 | return std::is_integral_v<Type>; | ||
| 233 | } | ||
| 234 | |||
| 218 | [[nodiscard]] std::string MinVal() const override final { | 235 | [[nodiscard]] std::string MinVal() const override final { |
| 219 | return this->ToString(minimum); | 236 | if constexpr (std::is_arithmetic_v<Type> && !ranged) { |
| 237 | return this->ToString(std::numeric_limits<Type>::min()); | ||
| 238 | } else { | ||
| 239 | return this->ToString(minimum); | ||
| 240 | } | ||
| 220 | } | 241 | } |
| 221 | [[nodiscard]] std::string MaxVal() const override final { | 242 | [[nodiscard]] std::string MaxVal() const override final { |
| 222 | return this->ToString(maximum); | 243 | if constexpr (std::is_arithmetic_v<Type> && !ranged) { |
| 244 | return this->ToString(std::numeric_limits<Type>::max()); | ||
| 245 | } else { | ||
| 246 | return this->ToString(maximum); | ||
| 247 | } | ||
| 223 | } | 248 | } |
| 224 | 249 | ||
| 225 | [[nodiscard]] constexpr bool Ranged() const override { | 250 | [[nodiscard]] constexpr bool Ranged() const override { |