From 836b9b9acbc2ff2d10d6f3c81e64b7b10b22f023 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 30 Apr 2017 18:07:57 +1000 Subject: Renderer: Move cull mode to a rasterization state object Also moves logic for primitive handling to VideoCommon. --- Source/Core/VideoBackends/OGL/VertexManager.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 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 19b9734be2..fd005e4860 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -114,17 +114,17 @@ void VertexManager::Draw(u32 stride) switch (m_current_primitive_type) { - case PRIMITIVE_POINTS: + case PrimitiveType::Points: primitive_mode = GL_POINTS; - glDisable(GL_CULL_FACE); break; - case PRIMITIVE_LINES: + case PrimitiveType::Lines: primitive_mode = GL_LINES; - glDisable(GL_CULL_FACE); break; - case PRIMITIVE_TRIANGLES: - primitive_mode = - g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? GL_TRIANGLE_STRIP : GL_TRIANGLES; + case PrimitiveType::Triangles: + primitive_mode = GL_TRIANGLES; + break; + case PrimitiveType::TriangleStrip: + primitive_mode = GL_TRIANGLE_STRIP; break; } @@ -140,9 +140,6 @@ void VertexManager::Draw(u32 stride) } INCSTAT(stats.thisFrame.numDrawCalls); - - if (m_current_primitive_type != PRIMITIVE_TRIANGLES) - static_cast(g_renderer.get())->SetGenerationMode(); } void VertexManager::vFlush() -- cgit v1.2.3