scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 00:58:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed s_primNumVerts.

Browse source
This commit is contained in:
bkaradzic 2012-11-25 22:32:27 -08:00
parent e3b0a82f0d
commit b2bde26fed
3 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/renderer_d3d11.cpp
View file

@ -17,13 +17,6 @@ namespace bgfx
D3D11_PRIMITIVE_TOPOLOGY_POINTLIST, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST,
}; };
static const uint32_t s_primNumVerts[] =
{
3,
2,
1,
};
static const D3D11_BLEND s_blendFactor[][2] = static const D3D11_BLEND s_blendFactor[][2] =
{ {
{ (D3D11_BLEND)0, (D3D11_BLEND)0 }, // ignored { (D3D11_BLEND)0, (D3D11_BLEND)0 }, // ignored
@ -1965,7 +1958,7 @@ namespace bgfx
if (primType != s_primType[primIndex]) if (primType != s_primType[primIndex])
{ {
primType = s_primType[primIndex]; primType = s_primType[primIndex];
primNumVerts = s_primNumVerts[primIndex]; primNumVerts = 3-primIndex;
deviceCtx->IASetPrimitiveTopology(primType); deviceCtx->IASetPrimitiveTopology(primType);
} }
} }
@ -2000,7 +1993,7 @@ namespace bgfx
if (primType != s_primType[primIndex]) if (primType != s_primType[primIndex])
{ {
primType = s_primType[primIndex]; primType = s_primType[primIndex];
primNumVerts = s_primNumVerts[primIndex]; primNumVerts = 3-primIndex;
deviceCtx->IASetPrimitiveTopology(primType); deviceCtx->IASetPrimitiveTopology(primType);
} }
} }

9
src/renderer_d3d9.cpp
View file

@ -17,13 +17,6 @@ namespace bgfx
D3DPT_POINTLIST, D3DPT_POINTLIST,
}; };
static const uint32_t s_primNumVerts[] =
{
3,
2,
1,
};
static const D3DMULTISAMPLE_TYPE s_checkMsaa[] = static const D3DMULTISAMPLE_TYPE s_checkMsaa[] =
{ {
D3DMULTISAMPLE_NONE, D3DMULTISAMPLE_NONE,
@ -2175,7 +2168,7 @@ namespace bgfx
uint8_t primIndex = uint8_t( (newFlags&BGFX_STATE_PT_MASK)>>BGFX_STATE_PT_SHIFT); uint8_t primIndex = uint8_t( (newFlags&BGFX_STATE_PT_MASK)>>BGFX_STATE_PT_SHIFT);
primType = s_primType[primIndex]; primType = s_primType[primIndex];
primNumVerts = s_primNumVerts[primIndex]; primNumVerts = 3-primIndex;
} }
bool programChanged = false; bool programChanged = false;

9
src/renderer_gl.cpp
View file

@ -703,13 +703,6 @@ namespace bgfx
GL_POINTS, GL_POINTS,
}; };
static const uint32_t s_primNumVerts[] =
{
3,
2,
1,
};
static const char* s_attribName[Attrib::Count] = static const char* s_attribName[Attrib::Count] =
{ {
"a_position", "a_position",
@ -2526,7 +2519,7 @@ namespace bgfx
uint8_t primIndex = uint8_t( (newFlags&BGFX_STATE_PT_MASK)>>BGFX_STATE_PT_SHIFT); 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]; primType = m_render->m_debug&BGFX_DEBUG_WIREFRAME ? GL_LINES : s_primType[primIndex];
primNumVerts = s_primNumVerts[primIndex]; primNumVerts = 3-primIndex;
} }
bool programChanged = false; bool programChanged = false;