From 325e8e370eddb236e29fd851a848f16ce7cdfd3d Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 19 Dec 2014 00:32:46 +0100 Subject: [PATCH] VertexLoader: Merge dummy functions --- Source/Core/VideoCommon/VertexLoader.cpp | 15 ++++----------- Source/Core/VideoCommon/VertexLoader.h | 2 -- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index d7c8fe3cfa..61303ab6f7 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -434,17 +434,17 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) } #endif -void VertexLoader::SetupRunVertices(int primitive, int const count) +int VertexLoader::RunVertices(int primitive, int count, DataReader src, DataReader dst) { + dst.WritePointer(&g_vertex_manager_write_ptr); + src.WritePointer(&g_video_buffer_read_ptr); + m_numLoadedVertices += count; // Prepare bounding box if (!g_ActiveConfig.backend_info.bSupportsBBox) BoundingBox::Prepare(m_vat, primitive, m_VtxDesc, m_native_vtx_decl); -} -void VertexLoader::ConvertVertices ( int count ) -{ #ifdef USE_VERTEX_LOADER_JIT if (count > 0) { @@ -461,13 +461,6 @@ void VertexLoader::ConvertVertices ( int count ) PRIM_LOG("\n"); } #endif -} -int VertexLoader::RunVertices(int primitive, int count, DataReader src, DataReader dst) -{ - dst.WritePointer(&g_vertex_manager_write_ptr); - src.WritePointer(&g_video_buffer_read_ptr); - SetupRunVertices(primitive, count); - ConvertVertices(count); return count; } diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index 749f738b25..2b61e683bc 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -82,8 +82,6 @@ private: #endif void CompileVertexTranslator(); - void ConvertVertices(int count); - void SetupRunVertices(int primitive, int const count); void WriteCall(TPipelineFunction);