diff options
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderBase.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 883dad31f6..c5baa503e6 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -168,11 +168,11 @@ public: } else { - ERROR_LOG(VIDEO, "Can't compare vertex loaders that expect different vertex formats!"); - ERROR_LOG(VIDEO, "a: m_VertexSize %d, m_native_components 0x%08x, stride %d", - a->m_VertexSize, a->m_native_components, a->m_native_vtx_decl.stride); - ERROR_LOG(VIDEO, "b: m_VertexSize %d, m_native_components 0x%08x, stride %d", - b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride); + ERROR_LOG_FMT(VIDEO, "Can't compare vertex loaders that expect different vertex formats!"); + ERROR_LOG_FMT(VIDEO, "a: m_VertexSize {}, m_native_components {:#010x}, stride {}", + a->m_VertexSize, a->m_native_components, a->m_native_vtx_decl.stride); + ERROR_LOG_FMT(VIDEO, "b: m_VertexSize {}, m_native_components {:#010x}, stride {}", + b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride); } } } @@ -188,16 +188,21 @@ public: b->RunVertices(src, DataReader(buffer_b.data(), buffer_b.data() + buffer_b.size()), count); if (count_a != count_b) - ERROR_LOG(VIDEO, - "The two vertex loaders have loaded a different amount of vertices (a: %d, b: %d).", - count_a, count_b); + { + ERROR_LOG_FMT( + VIDEO, + "The two vertex loaders have loaded a different amount of vertices (a: {}, b: {}).", + count_a, count_b); + } if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride)) - ERROR_LOG(VIDEO, - "The two vertex loaders have loaded different data " - "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).", - m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex); + { + ERROR_LOG_FMT(VIDEO, + "The two vertex loaders have loaded different data " + "(guru meditation {:#018x}, {:#010x}, {:#010x}, {:#010x}).", + m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex); + } memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride); m_numLoadedVertices += count; @@ -246,6 +251,6 @@ std::unique_ptr<VertexLoaderBase> VertexLoaderBase::CreateVertexLoader(const TVt if (loader->IsInitialized()) return loader; - PanicAlert("No Vertex Loader found."); + PanicAlertFmt("No Vertex Loader found."); return nullptr; } |