lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of primitive restart in qrenderdoc's BufferViewer

Browse Source
This commit is contained in:
baldurk
2017-04-20 15:00:07 +01:00
parent 1002742a14
commit 2632638615
3 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/CommonPipelineState.cpp
+4 -9
View File
@@ -554,14 +554,14 @@ bool CommonPipelineState::IsStripRestartEnabled()
return false;
}
uint32_t CommonPipelineState::GetStripRestartIndex(uint32_t indexByteWidth)
uint32_t CommonPipelineState::GetStripRestartIndex()
{
if(LogLoaded())
{
if(IsLogD3D11() || IsLogVK())
{
// D3D11 or Vulkan this is always '-1' in whichever size of index we're using
return indexByteWidth == 2 ? UINT16_MAX : UINT32_MAX;
// D3D11 or Vulkan this is always '-1'
return UINT32_MAX;
}
else if(IsLogD3D12())
{
@@ -569,12 +569,7 @@ uint32_t CommonPipelineState::GetStripRestartIndex(uint32_t indexByteWidth)
}
else if(IsLogGL())
{
uint32_t maxval = UINT32_MAX;
if(indexByteWidth == 2)
maxval = UINT16_MAX;
else if(indexByteWidth == 1)
maxval = 0xff;
return qMin(maxval, m_GL->m_VtxIn.restartIndex);
return qMin(UINT32_MAX, m_GL->m_VtxIn.restartIndex);
}
}
qrenderdoc/Code/Interface/CommonPipelineState.h
+1 -1
View File
@@ -364,7 +364,7 @@ Typically this is ``glsl`` or ``hlsl``.
:return: The index value that represents a strip restart not a real index.
:rtype: ``int``
)");
uint32_t GetStripRestartIndex(uint32_t indexByteWidth);
uint32_t GetStripRestartIndex();
DOCUMENT(R"(Retrieves the currently bound vertex buffers.
qrenderdoc/Windows/BufferViewer.cpp
+43 -27
View File
@@ -495,6 +495,9 @@ public:
{
idx = CalcIndex(indices, row, baseVertex);
if(primRestart && idx == primRestart)
return col == 1 ? "--" : " Restart";
if(idx == ~0U)
return QVariant();
}
@@ -597,6 +600,7 @@ public:
BufferData *indices = NULL;
QList<FormatElement> columns;
QList<BufferData *> buffers;
uint32_t primRestart = 0;
void setPosColumn(int pos)
{
@@ -1175,6 +1179,8 @@ void BufferViewer::OnEventChanged(uint32_t eventID)
m_ModelVSOut->secondaryName(), m_ModelGSOut->posName(), m_ModelGSOut->secondaryName(),
};
const DrawcallDescription *draw = m_Ctx.CurDrawcall();
if(m_MeshView)
{
ClearModels();
@@ -1182,6 +1188,23 @@ void BufferViewer::OnEventChanged(uint32_t eventID)
CalcColumnWidth();
ClearModels();
m_ModelVSIn->primRestart = 0;
m_ModelVSOut->primRestart = 0;
m_ModelGSOut->primRestart = 0;
if(m_Ctx.CurPipelineState().IsStripRestartEnabled() && (draw->flags & DrawFlags::UseIBuffer) &&
IsStrip(draw->topology))
{
m_ModelVSIn->primRestart = m_Ctx.CurPipelineState().GetStripRestartIndex();
if(draw->indexByteWidth == 1)
m_ModelVSIn->primRestart &= 0xff;
else if(draw->indexByteWidth == 2)
m_ModelVSIn->primRestart &= 0xffff;
m_ModelVSOut->primRestart = m_ModelVSIn->primRestart;
}
}
EnableCameraGuessControls();
@@ -1194,8 +1217,6 @@ void BufferViewer::OnEventChanged(uint32_t eventID)
m_ModelVSOut->beginReset();
m_ModelGSOut->beginReset();
const DrawcallDescription *draw = m_Ctx.CurDrawcall();
m_ModelVSIn->baseVertex = draw ? draw->baseVertex : 0;
ui->instance->setEnabled(draw && draw->numInstances > 1);
@@ -1324,28 +1345,45 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
maxIndex = 0;
if(draw->indexByteWidth == 1)
{
uint8_t primRestart = m_ModelVSIn->primRestart & 0xff;
for(size_t i = 0; i < (size_t)idata.count && (uint32_t)i < draw->numIndices; i++)
{
if(primRestart && idata.elems[i] == primRestart)
continue;
indices[i] = (uint32_t)idata.elems[i];
maxIndex = qMax(maxIndex, indices[i]);
}
}
else if(draw->indexByteWidth == 2)
{
uint16_t primRestart = m_ModelVSIn->primRestart & 0xffff;
uint16_t *src = (uint16_t *)idata.elems;
for(size_t i = 0;
i < (size_t)idata.count / sizeof(uint16_t) && (uint32_t)i < draw->numIndices; i++)
{
if(primRestart && idata.elems[i] == primRestart)
continue;
indices[i] = (uint32_t)src[i];
maxIndex = qMax(maxIndex, indices[i]);
}
}
else if(draw->indexByteWidth == 4)
{
uint16_t primRestart = m_ModelVSIn->primRestart;
memcpy(indices, idata.elems, qMin((size_t)idata.count, draw->numIndices * sizeof(uint32_t)));
for(uint32_t i = 0; i < draw->numIndices; i++)
{
if(primRestart && idata.elems[i] == primRestart)
continue;
maxIndex = qMax(maxIndex, indices[i]);
}
}
}
@@ -1420,32 +1458,11 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
indices = NULL;
if(m_ModelVSOut->indices)
m_ModelVSOut->indices->deref();
m_ModelVSOut->indices = new BufferData();
if(draw && draw->indexByteWidth != 0 && idata.count != 0)
{
indices = new uint32_t[draw->numIndices];
m_ModelVSOut->indices->data = (byte *)indices;
m_ModelVSOut->indices->end = (byte *)(indices + draw->numIndices);
}
if(draw && idata.count > 0)
if(m_ModelVSIn->indices)
{
if(draw->indexByteWidth == 1)
{
for(size_t i = 0; i < (size_t)idata.count && (uint32_t)i < draw->numIndices; i++)
indices[i] = (uint32_t)idata.elems[i];
}
else if(draw->indexByteWidth == 2)
{
uint16_t *src = (uint16_t *)idata.elems;
for(size_t i = 0;
i < (size_t)idata.count / sizeof(uint16_t) && (uint32_t)i < draw->numIndices; i++)
indices[i] = (uint32_t)src[i];
}
else if(draw->indexByteWidth == 4)
{
memcpy(indices, idata.elems, qMin((size_t)idata.count, draw->numIndices * sizeof(uint32_t)));
}
m_ModelVSOut->indices = m_ModelVSIn->indices;
m_ModelVSOut->indices->ref();
}
if(m_PostVS.buf != ResourceId())
@@ -1466,7 +1483,6 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
m_ModelGSOut->numRows = m_PostGS.numVerts;
indices = NULL;
m_ModelGSOut->indices = NULL;
if(m_PostGS.buf != ResourceId())