Bugfix for line topologies being compared wrongly

This commit is contained in:
baldurk
2015-01-25 22:49:53 +00:00
parent 6155d6d925
commit 29b40a0971
2 changed files with 5 additions and 7 deletions
+5 -6
View File
@@ -4871,7 +4871,6 @@ void D3D11DebugManager::RenderMesh(uint32_t frameID, uint32_t eventID, const vec
UINT bytesize = index16 ? 2 : 4;
m_HighlightCache.data = GetBufferData(cfg.position.buf, 0, 0);
m_HighlightCache.topo = topo;
if(ibuf == NULL || stage == eMeshDataStage_GSOut)
{
@@ -4896,7 +4895,7 @@ void D3D11DebugManager::RenderMesh(uint32_t frameID, uint32_t eventID, const vec
}
}
D3D11_PRIMITIVE_TOPOLOGY meshtopo = m_HighlightCache.topo;
D3D11_PRIMITIVE_TOPOLOGY meshtopo = topo;
uint32_t idx = cfg.highlightVert;
@@ -4928,10 +4927,10 @@ void D3D11DebugManager::RenderMesh(uint32_t frameID, uint32_t eventID, const vec
D3D11_PRIMITIVE_TOPOLOGY primTopo = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST; // tri or line list
uint32_t primSize = 3; // number of verts per primitive
if(meshtopo == eTopology_LineList ||
meshtopo == eTopology_LineList_Adj ||
meshtopo == eTopology_LineStrip ||
meshtopo == eTopology_LineStrip_Adj)
if(meshtopo == D3D11_PRIMITIVE_TOPOLOGY_LINELIST ||
meshtopo == D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ ||
meshtopo == D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP ||
meshtopo == D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ)
{
primSize = 2;
primTopo = D3D11_PRIMITIVE_TOPOLOGY_LINELIST;
-1
View File
@@ -303,7 +303,6 @@ class D3D11DebugManager
uint32_t EID;
MeshDataStage stage;
bool useidx;
D3D11_PRIMITIVE_TOPOLOGY topo;
vector<byte> data;
vector<uint32_t> indices;