From b2bde26feddf42b4e85ee18211d28db3e90dad40 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 25 Nov 2012 22:32:27 -0800 Subject: [PATCH] Removed s_primNumVerts. --- src/renderer_d3d11.cpp | 11 ++--------- src/renderer_d3d9.cpp | 9 +-------- src/renderer_gl.cpp | 9 +-------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index b0bbaa30..9ce92390 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -17,13 +17,6 @@ namespace bgfx D3D11_PRIMITIVE_TOPOLOGY_POINTLIST, }; - static const uint32_t s_primNumVerts[] = - { - 3, - 2, - 1, - }; - static const D3D11_BLEND s_blendFactor[][2] = { { (D3D11_BLEND)0, (D3D11_BLEND)0 }, // ignored @@ -1965,7 +1958,7 @@ namespace bgfx if (primType != s_primType[primIndex]) { primType = s_primType[primIndex]; - primNumVerts = s_primNumVerts[primIndex]; + primNumVerts = 3-primIndex; deviceCtx->IASetPrimitiveTopology(primType); } } @@ -2000,7 +1993,7 @@ namespace bgfx if (primType != s_primType[primIndex]) { primType = s_primType[primIndex]; - primNumVerts = s_primNumVerts[primIndex]; + primNumVerts = 3-primIndex; deviceCtx->IASetPrimitiveTopology(primType); } } diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 65706266..0672b601 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -17,13 +17,6 @@ namespace bgfx D3DPT_POINTLIST, }; - static const uint32_t s_primNumVerts[] = - { - 3, - 2, - 1, - }; - static const D3DMULTISAMPLE_TYPE s_checkMsaa[] = { D3DMULTISAMPLE_NONE, @@ -2175,7 +2168,7 @@ namespace bgfx uint8_t primIndex = uint8_t( (newFlags&BGFX_STATE_PT_MASK)>>BGFX_STATE_PT_SHIFT); primType = s_primType[primIndex]; - primNumVerts = s_primNumVerts[primIndex]; + primNumVerts = 3-primIndex; } bool programChanged = false; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 408e9aa4..7d424013 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -703,13 +703,6 @@ namespace bgfx GL_POINTS, }; - static const uint32_t s_primNumVerts[] = - { - 3, - 2, - 1, - }; - static const char* s_attribName[Attrib::Count] = { "a_position", @@ -2526,7 +2519,7 @@ namespace bgfx uint8_t primIndex = uint8_t( (newFlags&BGFX_STATE_PT_MASK)>>BGFX_STATE_PT_SHIFT); primType = m_render->m_debug&BGFX_DEBUG_WIREFRAME ? GL_LINES : s_primType[primIndex]; - primNumVerts = s_primNumVerts[primIndex]; + primNumVerts = 3-primIndex; } bool programChanged = false;