From 9859533ab461c6d509337d8b9013a7ba62dd78ae Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 26 Mar 2017 22:17:37 -0400 Subject: [PATCH] VertexLoaderBase: Return debug strings by value An out parameter for this sort of thing is a C++03 hold-over. This also renames AppendToString to ToString. --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 31 ++++++++++--------- Source/Core/VideoCommon/VertexLoaderBase.h | 2 +- .../Core/VideoCommon/VertexLoaderManager.cpp | 8 ++--- Source/Core/VideoCommon/VertexLoaderX64.cpp | 3 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index d65e0d053f..21a149c169 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -72,12 +72,13 @@ void VertexLoaderBase::SetVAT(const VAT& vat) m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac; }; -void VertexLoaderBase::AppendToString(std::string* dest) const +std::string VertexLoaderBase::ToString() const { - dest->reserve(250); + std::string dest; + dest.reserve(250); - dest->append(GetName()); - dest->append(": "); + dest += GetName(); + dest += ": "; static constexpr std::array pos_mode{{ "Inv", "Dir", "I8", "I16", @@ -89,14 +90,14 @@ void VertexLoaderBase::AppendToString(std::string* dest) const "565", "888", "888x", "4444", "6666", "8888", "Inv", "Inv", }}; - dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ", m_VertexSize, (u32)m_VtxDesc.PosMatIdx, - m_VtxAttr.PosElements ? 3 : 2, pos_mode[m_VtxDesc.Position], - pos_formats[m_VtxAttr.PosFormat])); + dest += StringFromFormat("%ib skin: %i P: %i %s-%s ", m_VertexSize, (u32)m_VtxDesc.PosMatIdx, + m_VtxAttr.PosElements ? 3 : 2, pos_mode[m_VtxDesc.Position], + pos_formats[m_VtxAttr.PosFormat]); if (m_VtxDesc.Normal) { - dest->append(StringFromFormat("Nrm: %i %s-%s ", m_VtxAttr.NormalElements, - pos_mode[m_VtxDesc.Normal], pos_formats[m_VtxAttr.NormalFormat])); + dest += StringFromFormat("Nrm: %i %s-%s ", m_VtxAttr.NormalElements, pos_mode[m_VtxDesc.Normal], + pos_formats[m_VtxAttr.NormalFormat]); } const std::array color_mode{{m_VtxDesc.Color0, m_VtxDesc.Color1}}; @@ -104,8 +105,8 @@ void VertexLoaderBase::AppendToString(std::string* dest) const { if (color_mode[i]) { - dest->append(StringFromFormat("C%zu: %i %s-%s ", i, m_VtxAttr.color[i].Elements, - pos_mode[color_mode[i]], color_format[m_VtxAttr.color[i].Comp])); + dest += StringFromFormat("C%zu: %i %s-%s ", i, m_VtxAttr.color[i].Elements, + pos_mode[color_mode[i]], color_format[m_VtxAttr.color[i].Comp]); } } const std::array tex_mode{{m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, @@ -115,12 +116,12 @@ void VertexLoaderBase::AppendToString(std::string* dest) const { if (tex_mode[i]) { - dest->append(StringFromFormat("T%zu: %i %s-%s ", i, m_VtxAttr.texCoord[i].Elements, - pos_mode[tex_mode[i]], - pos_formats[m_VtxAttr.texCoord[i].Format])); + dest += StringFromFormat("T%zu: %i %s-%s ", i, m_VtxAttr.texCoord[i].Elements, + pos_mode[tex_mode[i]], pos_formats[m_VtxAttr.texCoord[i].Format]); } } - dest->append(StringFromFormat(" - %i v", m_numLoadedVertices)); + dest += StringFromFormat(" - %i v", m_numLoadedVertices); + return dest; } // a hacky implementation to compare two vertex loaders diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h index 0c1c3c50cb..a895300466 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.h +++ b/Source/Core/VideoCommon/VertexLoaderBase.h @@ -67,7 +67,7 @@ public: virtual bool IsInitialized() = 0; // For debugging / profiling - void AppendToString(std::string* dest) const; + std::string ToString() const; virtual std::string GetName() const = 0; diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index c7a2f46bab..f0d8decb3d 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -106,11 +106,11 @@ void AppendListToString(std::string* dest) size_t total_size = 0; for (const auto& map_entry : s_vertex_loader_map) { - entry e; - map_entry.second->AppendToString(&e.text); - e.num_verts = map_entry.second->m_numLoadedVertices; - entries.push_back(e); + entry e = {map_entry.second->ToString(), + static_cast(map_entry.second->m_numLoadedVertices)}; + total_size += e.text.size() + 1; + entries.push_back(std::move(e)); } sort(entries.begin(), entries.end()); dest->reserve(dest->size() + total_size); diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp index 6b3f538bf4..92edf8dd5c 100644 --- a/Source/Core/VideoCommon/VertexLoaderX64.cpp +++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp @@ -51,8 +51,7 @@ VertexLoaderX64::VertexLoaderX64(const TVtxDesc& vtx_desc, const VAT& vtx_att) GenerateVertexLoader(); WriteProtect(); - std::string name; - AppendToString(&name); + const std::string name = ToString(); JitRegister::Register(region, GetCodePtr(), name.c_str()); }