lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-19 21:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if vertex buffer stride is 0 when picking vertices

Browse Source
This commit is contained in:
baldurk
2019-10-23 11:23:32 +01:00
parent bb8c8294e5
commit a08455c4fb
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/BufferViewer.cpp
+2 -2
View File
@@ -1385,8 +1385,8 @@ static void ConfigureMeshColumns(ICaptureContext &ctx, PopulateBufferData *bufda
BufferDescription *buf = ctx.GetBuffer(vb.resourceId);
if(buf)
{
numRowsUpperBound =
qMax(numRowsUpperBound, uint32_t(buf->length - vb.byteOffset) / vb.byteStride);
numRowsUpperBound = qMax(numRowsUpperBound,
uint32_t(buf->length - vb.byteOffset) / qMax(1U, vb.byteStride));
}
}
renderdoc/driver/d3d11/d3d11_replay.cpp
+1 -1
View File
@@ -2941,7 +2941,7 @@ uint32_t D3D11Replay::PickVertex(uint32_t eventId, int32_t width, int32_t height
GetDebugManager()->GetBufferData(vb, cfg.position.vertexByteOffset, 0, oldData);
// clamp maxIndex to upper bound in case we got invalid indices or primitive restart indices
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / cfg.position.vertexByteStride));
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / RDCMAX(1U, cfg.position.vertexByteStride)));
if(m_VertexPick.PickVBBuf == NULL || m_VertexPick.PickVBSize < (maxIndex + 1) * sizeof(Vec4f))
{
renderdoc/driver/d3d12/d3d12_replay.cpp
+1 -1
View File
@@ -2075,7 +2075,7 @@ uint32_t D3D12Replay::PickVertex(uint32_t eventId, int32_t width, int32_t height
GetDebugManager()->GetBufferData(vb, cfg.position.vertexByteOffset, 0, oldData);
// clamp maxIndex to upper bound in case we got invalid indices or primitive restart indices
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / cfg.position.vertexByteStride));
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / RDCMAX(1U, cfg.position.vertexByteStride)));
if(vb)
{
renderdoc/driver/gl/gl_debug.cpp
+1 -1
View File
@@ -2128,7 +2128,7 @@ uint32_t GLReplay::PickVertex(uint32_t eventId, int32_t width, int32_t height,
GetBufferData(cfg.position.vertexResourceId, cfg.position.vertexByteOffset, 0, oldData);
// clamp maxIndex to upper bound in case we got invalid indices or primitive restart indices
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / cfg.position.vertexByteStride));
maxIndex = RDCMIN(maxIndex, uint32_t(oldData.size() / RDCMAX(1U, cfg.position.vertexByteStride)));
if(DebugData.pickVBBuf == 0 || DebugData.pickVBSize < (maxIndex + 1) * sizeof(Vec4f))
{