piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: Make use of fmt outside of shader generators

Browse Source 
Migrates most of VideoCommon over to using fmt, with the exception being
the shader generator code. The shader generators are quite large and
have more corner cases to deal with in terms of conversion (shaders have
braces in them, so we need to make sure to escape them).

Because of the large amount of code that would need to be converted, the
conversion of VideoCommon will be in two parts:

- This change (which converts over the general case string formatting),
- A follow up change that will specifically deal with converting over
  the shader generators.
This commit is contained in:
Lioncash
2019-11-22 17:10:41 -05:00
parent bc449fb98f
commit 6fbbc2683e
12 changed files with 201 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoCommon/PostProcessing.cpp
View File

@ -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";