diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-11-28 15:03:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 15:03:23 -0800 |
| commit | 4a0611df5472ea58af2f7960c8fc91db56c68d5f (patch) | |
| tree | 3fc7a9c466cbecdaca0721e6e5d56869fd13ba4b /Source/Core/VideoCommon/PostProcessing.cpp | |
| parent | b5656df7e8c397474a00e7f64822e56bcdf826b6 (diff) | |
| parent | 6fbbc2683eeedf3767ea3d741c62555a30d3ff45 (diff) | |
Merge pull request #8487 from lioncash/video-fmt
VideoCommon: Make use of fmt outside of shader generators
Diffstat (limited to 'Source/Core/VideoCommon/PostProcessing.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/PostProcessing.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 23c0ded751..4d7b033f4e 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -8,6 +8,8 @@ #include <string> #include <string_view> +#include <fmt/format.h> + #include "Common/Assert.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" @@ -286,8 +288,10 @@ void PostProcessingConfiguration::SaveOptionsConfiguration() { std::string value; for (size_t i = 0; i < it.second.m_integer_values.size(); ++i) - value += StringFromFormat("%d%s", it.second.m_integer_values[i], - i == (it.second.m_integer_values.size() - 1) ? "" : ", "); + { + value += fmt::format("{}{}", it.second.m_integer_values[i], + i == (it.second.m_integer_values.size() - 1) ? "" : ", "); + } ini.GetOrCreateSection(section)->Set(it.second.m_option_name, value); } break; @@ -453,7 +457,7 @@ std::string PostProcessing::GetUniformBufferHeader() const if (it.second.m_type == PostProcessingConfiguration::ConfigurationOption::OptionType::OPTION_BOOL) { - ss << StringFromFormat(" int %s;\n", it.first.c_str()); + ss << fmt::format(" int {};\n", it.first); for (u32 i = 0; i < 3; i++) ss << " int ubo_align_" << unused_counter++ << "_;\n"; } @@ -462,9 +466,9 @@ std::string PostProcessing::GetUniformBufferHeader() const { u32 count = static_cast<u32>(it.second.m_integer_values.size()); if (count == 1) - ss << StringFromFormat(" int %s;\n", it.first.c_str()); + ss << fmt::format(" int {};\n", it.first); else - ss << StringFromFormat(" int%u %s;\n", count, it.first.c_str()); + ss << fmt::format(" int{} {};\n", count, it.first); for (u32 i = count; i < 4; i++) ss << " int ubo_align_" << unused_counter++ << "_;\n"; @@ -474,9 +478,9 @@ std::string PostProcessing::GetUniformBufferHeader() const { u32 count = static_cast<u32>(it.second.m_float_values.size()); if (count == 1) - ss << StringFromFormat(" float %s;\n", it.first.c_str()); + ss << fmt::format(" float {};\n", it.first); else - ss << StringFromFormat(" float%u %s;\n", count, it.first.c_str()); + ss << fmt::format(" float{} {};\n", count, it.first); for (u32 i = count; i < 4; i++) ss << " float ubo_align_" << unused_counter++ << "_;\n"; |