From dec0c3bce85ceda89ea05f00b94aad00e675598d Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 25 Feb 2018 01:15:35 +1000 Subject: Move shader caches to VideoCommon --- Source/Core/VideoBackends/OGL/VertexManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/VertexManager.cpp') diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index f98c72b1ad..00b20e3c76 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -162,8 +162,6 @@ void VertexManager::vFlush() GLVertexFormat* nativeVertexFmt = (GLVertexFormat*)VertexLoaderManager::GetCurrentVertexFormat(); u32 stride = nativeVertexFmt->GetVertexStride(); - ProgramShaderCache::SetShader(m_current_primitive_type, nativeVertexFmt); - PrepareDrawBuffers(stride); // upload global constants @@ -174,7 +172,11 @@ void VertexManager::vFlush() glEnable(GL_STENCIL_TEST); } - Draw(stride); + if (m_current_pipeline_object) + { + g_renderer->SetPipeline(m_current_pipeline_object); + Draw(stride); + } if (::BoundingBox::active && !g_Config.BBoxUseFragmentShaderImplementation()) { -- cgit v1.2.3