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

Rename DrawFlags::UseIBuffer to DrawFlags::Indexed

Browse Source
This commit is contained in:
baldurk
2018-06-15 19:40:54 +01:00
parent 4561b55464
commit 45c3c27923
22 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/BufferViewer.cpp
+7 -7
View File
@@ -1419,7 +1419,7 @@ void BufferViewer::OnEventChanged(uint32_t eventId)
m_ModelGSOut->primRestart = 0;
if(m_Ctx.CurPipelineState().IsStripRestartEnabled() && draw &&
(draw->flags & DrawFlags::UseIBuffer) && IsStrip(draw->topology))
(draw->flags & DrawFlags::Indexed) && IsStrip(draw->topology))
{
m_ModelVSIn->primRestart = m_Ctx.CurPipelineState().GetStripRestartIndex();
@@ -1581,7 +1581,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
rdcarray<BoundVBuffer> vbs = m_Ctx.CurPipelineState().GetVBuffers();
bytebuf idata;
if(ib.resourceId != ResourceId() && draw && (draw->flags & DrawFlags::UseIBuffer))
if(ib.resourceId != ResourceId() && draw && (draw->flags & DrawFlags::Indexed))
idata = r->GetBufferData(ib.resourceId, ib.byteOffset + draw->indexOffset * draw->indexByteWidth,
draw->numIndices * draw->indexByteWidth);
@@ -1595,7 +1595,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
m_ModelVSIn->indices->data = (byte *)indices;
m_ModelVSIn->indices->end = (byte *)(indices + draw->numIndices);
}
else if(draw && (draw->flags & DrawFlags::UseIBuffer))
else if(draw && (draw->flags & DrawFlags::Indexed))
{
indices = new uint32_t[1];
m_ModelVSIn->indices->data = (byte *)indices;
@@ -1723,7 +1723,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
m_ModelVSOut->baseVertex = m_PostVS.baseVertex;
m_ModelVSOut->displayBaseVertex = m_ModelVSIn->baseVertex;
if(draw && m_PostVS.indexResourceId != ResourceId() && (draw->flags & DrawFlags::UseIBuffer))
if(draw && m_PostVS.indexResourceId != ResourceId() && (draw->flags & DrawFlags::Indexed))
idata = r->GetBufferData(m_PostVS.indexResourceId, m_PostVS.indexByteOffset,
draw->numIndices * m_PostVS.indexByteStride);
@@ -2152,7 +2152,7 @@ void BufferViewer::updatePreviewColumns()
m_VSInPosition.indexResourceId = ib.resourceId;
m_VSInPosition.indexByteOffset = ib.byteOffset + draw->indexOffset * draw->indexByteWidth;
if((draw->flags & DrawFlags::UseIBuffer) && m_VSInPosition.indexByteStride == 0)
if((draw->flags & DrawFlags::Indexed) && m_VSInPosition.indexByteStride == 0)
m_VSInPosition.indexByteStride = 4U;
{
@@ -2252,7 +2252,7 @@ void BufferViewer::updatePreviewColumns()
m_PostGSPosition.indexByteStride = 0;
if(!(draw->flags & DrawFlags::UseIBuffer))
if(!(draw->flags & DrawFlags::Indexed))
m_PostVSPosition.indexByteStride = m_VSInPosition.indexByteStride = 0;
m_PostGSPosition.unproject = true;
@@ -2319,7 +2319,7 @@ void BufferViewer::configureMeshColumns()
// 0xdeadbeef) and we want to clamp.
uint32_t numRowsUpperBound = 0;
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
{
// In an indexed draw we clamp to however many indices are available in the index buffer
qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+1 -1
View File
@@ -1298,7 +1298,7 @@ void D3D11PipelineStateViewer::setState()
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
vs = ui->iaBuffers->verticalScrollBar()->value();
ui->iaBuffers->beginUpdate();
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+1 -1
View File
@@ -1327,7 +1327,7 @@ void D3D12PipelineStateViewer::setState()
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
vs = ui->iaBuffers->verticalScrollBar()->value();
ui->iaBuffers->beginUpdate();
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+1 -1
View File
@@ -1233,7 +1233,7 @@ void GLPipelineStateViewer::setState()
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
if(ibufferUsed)
{
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+1 -1
View File
@@ -1578,7 +1578,7 @@ void VulkanPipelineStateViewer::setState()
ui->viBuffers->beginUpdate();
ui->viBuffers->clear();
bool ibufferUsed = draw != NULL && (draw->flags & DrawFlags::UseIBuffer);
bool ibufferUsed = draw != NULL && (draw->flags & DrawFlags::Indexed);
if(state.inputAssembly.indexBuffer.resourceId != ResourceId())
{
renderdoc/api/replay/renderdoc_tostr.inl
+1 -1
View File
@@ -951,7 +951,7 @@ std::string DoStringise(const DrawFlags &el)
STRINGISE_BITFIELD_CLASS_BIT(GenMips);
STRINGISE_BITFIELD_CLASS_BIT(PassBoundary);
STRINGISE_BITFIELD_CLASS_BIT(UseIBuffer);
STRINGISE_BITFIELD_CLASS_BIT(Indexed);
STRINGISE_BITFIELD_CLASS_BIT(Instanced);
STRINGISE_BITFIELD_CLASS_BIT(Auto);
STRINGISE_BITFIELD_CLASS_BIT(Indirect);
renderdoc/api/replay/replay_enums.h
+1 -1
View File
@@ -3573,7 +3573,7 @@ enum class DrawFlags : uint32_t
PassBoundary = 0x1000,
// flags
UseIBuffer = 0x010000,
Indexed = 0x010000,
Instanced = 0x020000,
Auto = 0x040000,
Indirect = 0x080000,
renderdoc/driver/d3d11/d3d11_context.cpp
+1 -1
View File
@@ -915,7 +915,7 @@ void WrappedID3D11DeviceContext::AddUsage(const DrawcallDescription &d)
//////////////////////////////
// IA
if(d.flags & DrawFlags::UseIBuffer && pipe->IA.IndexBuffer != NULL)
if(d.flags & DrawFlags::Indexed && pipe->IA.IndexBuffer != NULL)
m_ResourceUses[GetIDForResource(pipe->IA.IndexBuffer)].push_back(
EventUsage(e, ResourceUsage::IndexBuffer));
renderdoc/driver/d3d11/d3d11_context_wrap.cpp
+3 -3
View File
@@ -3704,7 +3704,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexedInstanced(
draw.baseVertex = BaseVertexLocation;
draw.instanceOffset = StartInstanceLocation;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
AddDrawcall(draw, true);
}
@@ -3840,7 +3840,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexed(SerialiserType &ser, UINT
draw.baseVertex = BaseVertexLocation;
draw.indexOffset = StartIndexLocation;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
AddDrawcall(draw, true);
}
@@ -4135,7 +4135,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexedInstancedIndirect(Serialis
draw.name = name;
draw.flags |=
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer | DrawFlags::Indirect;
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect;
AddDrawcall(draw, true);
}
renderdoc/driver/d3d11/d3d11_pixelhistory.cpp
+1 -1
View File
@@ -2414,7 +2414,7 @@ vector<PixelModification> D3D11Replay::PixelHistory(vector<EventUsage> events, R
m_pImmediateContext->Begin(testQueries[0]);
// do draw
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
{
// TODO once pixel history distinguishes between instances, draw only the instance for
// this fragment
renderdoc/driver/d3d11/d3d11_postvs.cpp
+5 -5
View File
@@ -307,7 +307,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
ID3D11Buffer *origBuf = idxBuf;
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
m_pImmediateContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
@@ -617,7 +617,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
m_PostVSData[eventId].vsout.nearPlane = nearp;
m_PostVSData[eventId].vsout.farPlane = farp;
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::UseIBuffer);
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::Indexed);
m_PostVSData[eventId].vsout.numVerts = drawcall->numIndices;
m_PostVSData[eventId].vsout.instStride = 0;
@@ -731,7 +731,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
if(drawcall->flags & DrawFlags::Instanced)
{
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
m_pImmediateContext->DrawIndexedInstanced(drawcall->numIndices, drawcall->numInstances,
drawcall->indexOffset, drawcall->baseVertex,
@@ -753,7 +753,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
}
else
{
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
m_pImmediateContext->DrawIndexed(drawcall->numIndices, drawcall->indexOffset,
drawcall->baseVertex);
@@ -813,7 +813,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
// difference how much each instance wrote.
for(uint32_t inst = 1; inst <= drawcall->numInstances; inst++)
{
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
m_pImmediateContext->SOSetTargets(1, &m_SOBuffer, &offset);
m_pImmediateContext->Begin(m_SOStatsQueries[inst - 1]);
renderdoc/driver/d3d11/d3d11_shaderdebug.cpp
+1 -1
View File
@@ -909,7 +909,7 @@ ShaderDebugTrace D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, uin
{
uint32_t sv_vertid = vertid;
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
sv_vertid = idx;
if(dxbc->m_InputSig[i].compType == CompType::Float)
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+3 -3
View File
@@ -3060,7 +3060,7 @@ bool WrappedID3D12GraphicsCommandList2::Serialise_DrawIndexedInstanced(
draw.baseVertex = BaseVertexLocation;
draw.instanceOffset = StartInstanceLocation;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
m_Cmd->AddDrawcall(draw, true);
}
@@ -3512,8 +3512,8 @@ void WrappedID3D12GraphicsCommandList2::PatchExecuteIndirect(BakedCmdListInfo &i
curDraw.baseVertex = args->BaseVertexLocation;
curDraw.vertexOffset = args->StartIndexLocation;
curDraw.instanceOffset = args->StartInstanceLocation;
curDraw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer |
DrawFlags::Indirect;
curDraw.flags |=
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect;
curDraw.name = StringFormat::Fmt("[%u] arg%u: IndirectDrawIndexed(<%u, %u>)", i, a,
curDraw.numIndices, curDraw.numInstances);
renderdoc/driver/d3d12/d3d12_commands.cpp
+1 -1
View File
@@ -1213,7 +1213,7 @@ void D3D12CommandData::AddUsage(D3D12DrawcallTreeNode &drawNode)
{
rootdata = &state.graphics;
if(d.flags & DrawFlags::UseIBuffer && state.ibuffer.buf != ResourceId())
if(d.flags & DrawFlags::Indexed && state.ibuffer.buf != ResourceId())
drawNode.resourceUsage.push_back(
std::make_pair(state.ibuffer.buf, EventUsage(e, ResourceUsage::IndexBuffer)));
renderdoc/driver/d3d12/d3d12_postvs.cpp
+5 -5
View File
@@ -338,7 +338,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
ID3D12GraphicsCommandList2 *list = NULL;
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
if(recreate)
{
@@ -709,7 +709,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
m_PostVSData[eventId].vsout.nearPlane = nearp;
m_PostVSData[eventId].vsout.farPlane = farp;
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::UseIBuffer);
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::Indexed);
m_PostVSData[eventId].vsout.numVerts = drawcall->numIndices;
m_PostVSData[eventId].vsout.instStride = 0;
@@ -850,7 +850,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
list->BeginQuery(m_SOQueryHeap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
// because the result is expanded we don't have to remap index buffers or anything
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
list->DrawIndexedInstanced(drawcall->numIndices, drawcall->numInstances,
drawcall->indexOffset, drawcall->baseVertex,
@@ -940,7 +940,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
// each instance wrote.
for(uint32_t inst = 1; inst <= drawcall->numInstances; inst++)
{
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
view.BufferFilledSizeLocation =
m_SOBuffer->GetGPUVirtualAddress() + (inst - 1) * sizeof(UINT64);
@@ -994,7 +994,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
list->BeginQuery(m_SOQueryHeap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
// because the result is expanded we don't have to remap index buffers or anything
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
list->DrawIndexedInstanced(drawcall->numIndices, drawcall->numInstances,
drawcall->indexOffset, drawcall->baseVertex,
renderdoc/driver/gl/gl_driver.cpp
+1 -1
View File
@@ -4456,7 +4456,7 @@ void WrappedOpenGL::AddUsage(const DrawcallDescription &d)
//////////////////////////////
// Input
if(d.flags & DrawFlags::UseIBuffer)
if(d.flags & DrawFlags::Indexed)
{
GLuint ibuffer = 0;
gl.glGetIntegerv(eGL_ELEMENT_ARRAY_BUFFER_BINDING, (GLint *)&ibuffer);
renderdoc/driver/gl/gl_postvs.cpp
+5 -5
View File
@@ -364,7 +364,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
GLuint idxBuf = 0;
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
uint64_t outputSize = uint64_t(drawcall->numIndices) * stride;
@@ -727,7 +727,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
m_PostVSData[eventId].vsout.nearPlane = nearp;
m_PostVSData[eventId].vsout.farPlane = farp;
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::UseIBuffer);
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::Indexed);
m_PostVSData[eventId].vsout.numVerts = drawcall->numIndices;
m_PostVSData[eventId].vsout.instStride = 0;
@@ -1098,7 +1098,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
DebugData.feedbackQueries[inst - 1]);
gl.glBeginTransformFeedback(lastOutTopo);
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
if(HasExt[ARB_base_instance])
{
@@ -1139,7 +1139,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
gl.glBeginQuery(eGL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, DebugData.feedbackQueries[0]);
gl.glBeginTransformFeedback(lastOutTopo);
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
if(HasExt[ARB_base_instance])
{
@@ -1180,7 +1180,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
gl.glBeginQuery(eGL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, DebugData.feedbackQueries[0]);
gl.glBeginTransformFeedback(lastOutTopo);
if(!(drawcall->flags & DrawFlags::UseIBuffer))
if(!(drawcall->flags & DrawFlags::Indexed))
{
gl.glDrawArrays(drawtopo, drawcall->vertexOffset, drawcall->numIndices);
}
renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+15 -15
View File
@@ -1201,7 +1201,7 @@ bool WrappedOpenGL::Serialise_glDrawElements(SerialiserType &ser, GLenum mode, G
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1279,7 +1279,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsIndirect(SerialiserType &ser, GLenum
draw.instanceOffset = params.baseInstance;
draw.flags |=
DrawFlags::Drawcall | DrawFlags::UseIBuffer | DrawFlags::Instanced | DrawFlags::Indirect;
DrawFlags::Drawcall | DrawFlags::Indexed | DrawFlags::Instanced | DrawFlags::Indirect;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1359,7 +1359,7 @@ bool WrappedOpenGL::Serialise_glDrawRangeElements(SerialiserType &ser, GLenum mo
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1441,7 +1441,7 @@ bool WrappedOpenGL::Serialise_glDrawRangeElementsBaseVertex(SerialiserType &ser,
draw.baseVertex = basevertex;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1521,7 +1521,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsBaseVertex(SerialiserType &ser, GLen
draw.baseVertex = basevertex;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1599,7 +1599,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsInstanced(SerialiserType &ser, GLenu
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer | DrawFlags::Instanced;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed | DrawFlags::Instanced;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1681,7 +1681,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsInstancedBaseInstance(SerialiserType
draw.vertexOffset = 0;
draw.instanceOffset = baseinstance;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1766,7 +1766,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsInstancedBaseVertex(SerialiserType &
draw.baseVertex = basevertex;
draw.instanceOffset = 0;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -1850,7 +1850,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsInstancedBaseVertexBaseInstance(
draw.baseVertex = basevertex;
draw.instanceOffset = baseinstance;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
draw.topology = MakePrimitiveTopology(m_Real, mode);
draw.indexByteWidth = IdxSize;
@@ -2091,7 +2091,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElements(SerialiserType &ser, GLenum mo
multidraw.name =
StringFormat::Fmt("%s[%i](%u)", ToStr(gl_CurChunk).c_str(), i, multidraw.numIndices);
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
multidraw.topology = MakePrimitiveTopology(m_Real, mode);
@@ -2244,7 +2244,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsBaseVertex(SerialiserType &ser,
multidraw.name =
StringFormat::Fmt("%s[%i](%u)", ToStr(gl_CurChunk).c_str(), i, multidraw.numIndices);
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
multidraw.topology = MakePrimitiveTopology(m_Real, mode);
multidraw.indexByteWidth = IdxSize;
@@ -2596,8 +2596,8 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirect(SerialiserType &ser, G
multidraw.name = StringFormat::Fmt("%s[%i](<%u, %u>)", ToStr(gl_CurChunk).c_str(), i,
multidraw.numIndices, multidraw.numInstances);
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer | DrawFlags::Instanced |
DrawFlags::Indirect;
multidraw.flags |=
DrawFlags::Drawcall | DrawFlags::Indexed | DrawFlags::Instanced | DrawFlags::Indirect;
multidraw.topology = MakePrimitiveTopology(m_Real, mode);
multidraw.indexByteWidth = IdxSize;
@@ -3002,8 +3002,8 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirectCountARB(SerialiserType
multidraw.name = StringFormat::Fmt("%s[%i](<%u, %u>)", ToStr(gl_CurChunk).c_str(), i,
multidraw.numIndices, multidraw.numInstances);
multidraw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer | DrawFlags::Instanced |
DrawFlags::Indirect;
multidraw.flags |=
DrawFlags::Drawcall | DrawFlags::Indexed | DrawFlags::Instanced | DrawFlags::Indirect;
multidraw.topology = MakePrimitiveTopology(m_Real, mode);
multidraw.indexByteWidth = IdxSize;
renderdoc/driver/vulkan/vk_core.cpp
+1 -1
View File
@@ -3104,7 +3104,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector<DebugMessa
//////////////////////////////
// Vertex input
if(d.flags & DrawFlags::UseIBuffer && state.ibuffer != ResourceId())
if(d.flags & DrawFlags::Indexed && state.ibuffer != ResourceId())
drawNode.resourceUsage.push_back(
std::make_pair(state.ibuffer, EventUsage(e, ResourceUsage::IndexBuffer)));
renderdoc/driver/vulkan/vk_overlay.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ void VulkanDebugManager::PatchLineStripIndexBuffer(const DrawcallDescription *dr
uint16_t *idx16 = NULL;
uint32_t *idx32 = NULL;
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
{
GetBufferData(rs.ibuffer.buf,
rs.ibuffer.offs + uint64_t(draw->indexOffset) * draw->indexByteWidth,
renderdoc/driver/vulkan/vk_postvs.cpp
+6 -6
View File
@@ -518,7 +518,7 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
SPIRVId idxImagePtr = 0;
SPIRVId idxSampledTypeID = 0;
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
{
uint32Vec4ID = editor.DeclareType(SPIRVVector(scalar<uint32_t>(), 4));
@@ -747,7 +747,7 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
// if we're indexing, look up the index buffer. We don't have to apply vertexOffset - it was
// already applied when we read back and uniq-ified the index buffer.
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
{
// sampledimage idximg = *idximgPtr;
uint32_t loaded = editor.MakeId();
@@ -792,7 +792,7 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
uint32_t vertexLookup = vertexIndex;
uint32_t instanceLookup = instID;
if(!(draw->flags & DrawFlags::UseIBuffer))
if(!(draw->flags & DrawFlags::Indexed))
{
// for non-indexed draws, we manually apply the vertex offset, but here after we used the
// 0-based one to calculate the array slot
@@ -831,7 +831,7 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
}
else if(builtin == ShaderBuiltin::BaseVertex)
{
if(draw->flags & DrawFlags::UseIBuffer)
if(draw->flags & DrawFlags::Indexed)
ops.push_back(SPIRVOperation(
spv::OpStore, {ins[i].variableID, editor.AddConstantImmediate(
int32_t(draw->vertexOffset & 0x7fffffff))}));
@@ -1206,7 +1206,7 @@ void VulkanReplay::InitPostVSBuffers(uint32_t eventId)
uint32_t maxInstance = drawcall->instanceOffset + drawcall->numInstances - 1;
if(drawcall->flags & DrawFlags::UseIBuffer)
if(drawcall->flags & DrawFlags::Indexed)
{
bool index16 = (idxsize == 2);
bytebuf idxdata;
@@ -2021,7 +2021,7 @@ void VulkanReplay::InitPostVSBuffers(uint32_t eventId)
m_PostVSData[eventId].vsout.nearPlane = nearp;
m_PostVSData[eventId].vsout.farPlane = farp;
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::UseIBuffer);
m_PostVSData[eventId].vsout.useIndices = bool(drawcall->flags & DrawFlags::Indexed);
m_PostVSData[eventId].vsout.numVerts = drawcall->numIndices;
m_PostVSData[eventId].vsout.instStride = 0;
renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
+5 -5
View File
@@ -213,7 +213,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexed(SerialiserType &ser, VkCommandBuf
draw.baseVertex = vertexOffset;
draw.instanceOffset = firstInstance;
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer | DrawFlags::Instanced;
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed | DrawFlags::Instanced;
AddDrawcall(draw, true);
}
@@ -753,8 +753,8 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect(SerialiserType &ser,
AddEvent();
draw.name = name;
draw.flags = DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer |
DrawFlags::Indirect;
draw.flags =
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect;
AddDrawcall(draw, true);
@@ -806,8 +806,8 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect(SerialiserType &ser,
multi.name = "vkCmdDrawIndexedIndirect[" + ToStr(i) + "](<" + ToStr(multi.numIndices) +
", " + ToStr(multi.numInstances) + ">)";
multi.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer |
DrawFlags::Indirect;
multi.flags |=
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect;
// add a fake chunk for this individual indirect draw
SDChunk *fakeChunk = new SDChunk(multi.name.c_str());