From 6f715a1fbefa6d1bdd9894bf88016ea92fa635b7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 1 Aug 2014 23:42:15 -0700 Subject: VertexLoader: Remove more global state dependencies (this time IndexGenerator and VertexManager) --- Source/Core/VideoCommon/VertexLoaderManager.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/VertexLoaderManager.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index d5e74a0e11..d94af17360 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -9,6 +9,7 @@ #include "Core/HW/Memmap.h" +#include "VideoCommon/IndexGenerator.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoader.h" #include "VideoCommon/VertexLoaderManager.h" @@ -152,7 +153,15 @@ void RunVertices(int vtx_attr_group, int primitive, int count) VertexManager::Flush(); s_current_vtx_fmt = required_vtx_fmt; - RefreshLoader(vtx_attr_group)->RunVertices(g_VtxAttr[vtx_attr_group], primitive, count); + VertexManager::PrepareForAdditionalData(primitive, count, + loader->GetNativeVertexDeclaration().stride); + + loader->RunVertices(g_VtxAttr[vtx_attr_group], primitive, count); + + IndexGenerator::AddIndices(primitive, count); + + ADDSTAT(stats.thisFrame.numPrims, count); + INCSTAT(stats.thisFrame.numPrimitiveJoins); } int GetVertexSize(int vtx_attr_group) -- cgit v1.2.3