GraphicsTarget: Reduce object churn a little

This commit is contained in:
Lioncash 2024-01-24 23:00:01 -05:00
parent 1b7da37114
commit 7a59ecc39d
1 changed files with 41 additions and 43 deletions

View File

@ -155,49 +155,47 @@ std::optional<std::string> ExtractTextureFilenameForConfig(const picojson::objec
void SerializeTargetToConfig(picojson::object& json_obj, const GraphicsTargetConfig& target)
{
std::visit(
overloaded{
[&](const DrawStartedTextureTarget& the_target) {
json_obj["type"] = picojson::value{"draw_started"};
json_obj["texture_filename"] = picojson::value{the_target.m_texture_info_string};
},
[&](const LoadTextureTarget& the_target) {
json_obj["type"] = picojson::value{"load_texture"};
json_obj["texture_filename"] = picojson::value{the_target.m_texture_info_string};
},
[&](const CreateTextureTarget& the_target) {
json_obj["type"] = picojson::value{"create_texture"};
json_obj["texture_filename"] = picojson::value{the_target.m_texture_info_string};
},
[&](const EFBTarget& the_target) {
json_obj["type"] = picojson::value{"efb"};
json_obj["texture_filename"] = picojson::value{
fmt::format("{}_{}x{}_{}", EFB_DUMP_PREFIX, the_target.m_width, the_target.m_height,
static_cast<int>(the_target.m_texture_format))};
},
[&](const XFBTarget& the_target) {
json_obj["type"] = picojson::value{"xfb"};
json_obj["texture_filename"] = picojson::value{
fmt::format("{}_{}x{}_{}", XFB_DUMP_PREFIX, the_target.m_width, the_target.m_height,
static_cast<int>(the_target.m_texture_format))};
},
[&](const ProjectionTarget& the_target) {
json_obj["type"] = picojson::value{"projection"};
if (the_target.m_projection_type == ProjectionType::Orthographic)
{
json_obj["type"] = picojson::value{"2d"};
}
else
{
json_obj["type"] = picojson::value{"3d"};
}
if (the_target.m_texture_info_string)
{
json_obj["texture_filename"] = picojson::value{*the_target.m_texture_info_string};
}
},
},
target);
std::visit(overloaded{
[&](const DrawStartedTextureTarget& the_target) {
json_obj.emplace("type", "draw_started");
json_obj.emplace("texture_filename", the_target.m_texture_info_string);
},
[&](const LoadTextureTarget& the_target) {
json_obj.emplace("type", "load_texture");
json_obj.emplace("texture_filename", the_target.m_texture_info_string);
},
[&](const CreateTextureTarget& the_target) {
json_obj.emplace("type", "create_texture");
json_obj.emplace("texture_filename", the_target.m_texture_info_string);
},
[&](const EFBTarget& the_target) {
json_obj.emplace("type", "efb");
json_obj.emplace("texture_filename",
fmt::format("{}_{}x{}_{}", EFB_DUMP_PREFIX, the_target.m_width,
the_target.m_height,
static_cast<int>(the_target.m_texture_format)));
},
[&](const XFBTarget& the_target) {
json_obj.emplace("type", "xfb");
json_obj.emplace("texture_filename",
fmt::format("{}_{}x{}_{}", XFB_DUMP_PREFIX, the_target.m_width,
the_target.m_height,
static_cast<int>(the_target.m_texture_format)));
},
[&](const ProjectionTarget& the_target) {
const char* type_name = "3d";
if (the_target.m_projection_type == ProjectionType::Orthographic)
type_name = "2d";
json_obj.emplace("type", type_name);
if (the_target.m_texture_info_string)
{
json_obj.emplace("texture_filename", *the_target.m_texture_info_string);
}
},
},
target);
}
std::optional<GraphicsTargetConfig> DeserializeTargetFromConfig(const picojson::object& obj)