summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/VertexLoaderBase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp')
-rw-r--r--Source/Core/VideoCommon/VertexLoaderBase.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp
index d5831bc8e5..681f43b4fa 100644
--- a/Source/Core/VideoCommon/VertexLoaderBase.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp
@@ -120,7 +120,7 @@ void VertexLoaderBase::AppendToString(std::string *dest) const
i, m_VtxAttr.texCoord[i].Elements, posMode[tex_mode[i]], posFormats[m_VtxAttr.texCoord[i].Format]));
}
}
- dest->append(StringFromFormat(" - %i v\n", m_numLoadedVertices));
+ dest->append(StringFromFormat(" - %i v", m_numLoadedVertices));
}
// a hacky implementation to compare two vertex loaders
@@ -131,13 +131,14 @@ public:
: VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b)
{
m_initialized = a && b && a->IsInitialized() && b->IsInitialized();
- bool can_test = a->m_VertexSize == b->m_VertexSize &&
- a->m_native_components == b->m_native_components &&
- a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride;
if (m_initialized)
{
- if (can_test)
+ m_initialized = a->m_VertexSize == b->m_VertexSize &&
+ a->m_native_components == b->m_native_components &&
+ a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride;
+
+ if (m_initialized)
{
m_VertexSize = a->m_VertexSize;
m_native_components = a->m_native_components;
@@ -152,8 +153,6 @@ public:
b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride);
}
}
-
- m_initialized &= can_test;
}
~VertexLoaderTester() override
{