diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-08-23 07:33:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 07:33:25 +0200 |
| commit | 52af0770c352e5d599f8a95c2c9d2fe98b265418 (patch) | |
| tree | 573dc3416dd0627d76190aa04fb62e047f927c8f /Source/Core/VideoCommon/VertexLoaderManager.cpp | |
| parent | 8d186a468fffaf73fe36f57d050e7370e37f91ca (diff) | |
| parent | 2bf05a544de9e737714c67ffe2247d661bc5e406 (diff) | |
Merge pull request #4141 from lioncash/vtx
VertexManagerBase: Get rid of static state
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderManager.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 7975ea1eb7..e9c4533244 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -196,7 +196,7 @@ int RunVertices(int vtx_attr_group, int primitive, int count, DataReader src, bo if (loader->m_native_vertex_format != s_current_vtx_fmt || loader->m_native_components != g_current_components) { - VertexManagerBase::Flush(); + g_vertex_manager->Flush(); } s_current_vtx_fmt = loader->m_native_vertex_format; g_current_components = loader->m_native_components; @@ -206,14 +206,14 @@ int RunVertices(int vtx_attr_group, int primitive, int count, DataReader src, bo // slope. bool cullall = (bpmem.genMode.cullmode == GenMode::CULL_ALL && primitive < 5); - DataReader dst = VertexManagerBase::PrepareForAdditionalData( + DataReader dst = g_vertex_manager->PrepareForAdditionalData( primitive, count, loader->m_native_vtx_decl.stride, cullall); count = loader->RunVertices(src, dst, count); IndexGenerator::AddIndices(primitive, count); - VertexManagerBase::FlushData(count, loader->m_native_vtx_decl.stride); + g_vertex_manager->FlushData(count, loader->m_native_vtx_decl.stride); ADDSTAT(stats.thisFrame.numPrims, count); INCSTAT(stats.thisFrame.numPrimitiveJoins); |
