Skip to content

Commit 45c3c27

Browse files
committed
Rename DrawFlags::UseIBuffer to DrawFlags::Indexed
1 parent 4561b55 commit 45c3c27

22 files changed

+67
-67
lines changed

qrenderdoc/Windows/BufferViewer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ void BufferViewer::OnEventChanged(uint32_t eventId)
14191419
m_ModelGSOut->primRestart = 0;
14201420

14211421
if(m_Ctx.CurPipelineState().IsStripRestartEnabled() && draw &&
1422-
(draw->flags & DrawFlags::UseIBuffer) && IsStrip(draw->topology))
1422+
(draw->flags & DrawFlags::Indexed) && IsStrip(draw->topology))
14231423
{
14241424
m_ModelVSIn->primRestart = m_Ctx.CurPipelineState().GetStripRestartIndex();
14251425

@@ -1581,7 +1581,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
15811581
rdcarray<BoundVBuffer> vbs = m_Ctx.CurPipelineState().GetVBuffers();
15821582

15831583
bytebuf idata;
1584-
if(ib.resourceId != ResourceId() && draw && (draw->flags & DrawFlags::UseIBuffer))
1584+
if(ib.resourceId != ResourceId() && draw && (draw->flags & DrawFlags::Indexed))
15851585
idata = r->GetBufferData(ib.resourceId, ib.byteOffset + draw->indexOffset * draw->indexByteWidth,
15861586
draw->numIndices * draw->indexByteWidth);
15871587

@@ -1595,7 +1595,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
15951595
m_ModelVSIn->indices->data = (byte *)indices;
15961596
m_ModelVSIn->indices->end = (byte *)(indices + draw->numIndices);
15971597
}
1598-
else if(draw && (draw->flags & DrawFlags::UseIBuffer))
1598+
else if(draw && (draw->flags & DrawFlags::Indexed))
15991599
{
16001600
indices = new uint32_t[1];
16011601
m_ModelVSIn->indices->data = (byte *)indices;
@@ -1723,7 +1723,7 @@ void BufferViewer::RT_FetchMeshData(IReplayController *r)
17231723
m_ModelVSOut->baseVertex = m_PostVS.baseVertex;
17241724
m_ModelVSOut->displayBaseVertex = m_ModelVSIn->baseVertex;
17251725

1726-
if(draw && m_PostVS.indexResourceId != ResourceId() && (draw->flags & DrawFlags::UseIBuffer))
1726+
if(draw && m_PostVS.indexResourceId != ResourceId() && (draw->flags & DrawFlags::Indexed))
17271727
idata = r->GetBufferData(m_PostVS.indexResourceId, m_PostVS.indexByteOffset,
17281728
draw->numIndices * m_PostVS.indexByteStride);
17291729

@@ -2152,7 +2152,7 @@ void BufferViewer::updatePreviewColumns()
21522152
m_VSInPosition.indexResourceId = ib.resourceId;
21532153
m_VSInPosition.indexByteOffset = ib.byteOffset + draw->indexOffset * draw->indexByteWidth;
21542154

2155-
if((draw->flags & DrawFlags::UseIBuffer) && m_VSInPosition.indexByteStride == 0)
2155+
if((draw->flags & DrawFlags::Indexed) && m_VSInPosition.indexByteStride == 0)
21562156
m_VSInPosition.indexByteStride = 4U;
21572157

21582158
{
@@ -2252,7 +2252,7 @@ void BufferViewer::updatePreviewColumns()
22522252

22532253
m_PostGSPosition.indexByteStride = 0;
22542254

2255-
if(!(draw->flags & DrawFlags::UseIBuffer))
2255+
if(!(draw->flags & DrawFlags::Indexed))
22562256
m_PostVSPosition.indexByteStride = m_VSInPosition.indexByteStride = 0;
22572257

22582258
m_PostGSPosition.unproject = true;
@@ -2319,7 +2319,7 @@ void BufferViewer::configureMeshColumns()
23192319
// 0xdeadbeef) and we want to clamp.
23202320
uint32_t numRowsUpperBound = 0;
23212321

2322-
if(draw->flags & DrawFlags::UseIBuffer)
2322+
if(draw->flags & DrawFlags::Indexed)
23232323
{
23242324
// In an indexed draw we clamp to however many indices are available in the index buffer
23252325

qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ void D3D11PipelineStateViewer::setState()
12981298

12991299
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
13001300

1301-
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
1301+
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
13021302

13031303
vs = ui->iaBuffers->verticalScrollBar()->value();
13041304
ui->iaBuffers->beginUpdate();

qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ void D3D12PipelineStateViewer::setState()
13271327

13281328
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
13291329

1330-
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
1330+
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
13311331

13321332
vs = ui->iaBuffers->verticalScrollBar()->value();
13331333
ui->iaBuffers->beginUpdate();

qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ void GLPipelineStateViewer::setState()
12331233

12341234
m_Common.setTopologyDiagram(ui->topologyDiagram, topo);
12351235

1236-
bool ibufferUsed = draw && (draw->flags & DrawFlags::UseIBuffer);
1236+
bool ibufferUsed = draw && (draw->flags & DrawFlags::Indexed);
12371237

12381238
if(ibufferUsed)
12391239
{

qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ void VulkanPipelineStateViewer::setState()
15781578
ui->viBuffers->beginUpdate();
15791579
ui->viBuffers->clear();
15801580

1581-
bool ibufferUsed = draw != NULL && (draw->flags & DrawFlags::UseIBuffer);
1581+
bool ibufferUsed = draw != NULL && (draw->flags & DrawFlags::Indexed);
15821582

15831583
if(state.inputAssembly.indexBuffer.resourceId != ResourceId())
15841584
{

renderdoc/api/replay/renderdoc_tostr.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ std::string DoStringise(const DrawFlags &el)
951951
STRINGISE_BITFIELD_CLASS_BIT(GenMips);
952952
STRINGISE_BITFIELD_CLASS_BIT(PassBoundary);
953953

954-
STRINGISE_BITFIELD_CLASS_BIT(UseIBuffer);
954+
STRINGISE_BITFIELD_CLASS_BIT(Indexed);
955955
STRINGISE_BITFIELD_CLASS_BIT(Instanced);
956956
STRINGISE_BITFIELD_CLASS_BIT(Auto);
957957
STRINGISE_BITFIELD_CLASS_BIT(Indirect);

renderdoc/api/replay/replay_enums.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3573,7 +3573,7 @@ enum class DrawFlags : uint32_t
35733573
PassBoundary = 0x1000,
35743574

35753575
// flags
3576-
UseIBuffer = 0x010000,
3576+
Indexed = 0x010000,
35773577
Instanced = 0x020000,
35783578
Auto = 0x040000,
35793579
Indirect = 0x080000,

renderdoc/driver/d3d11/d3d11_context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ void WrappedID3D11DeviceContext::AddUsage(const DrawcallDescription &d)
915915
//////////////////////////////
916916
// IA
917917

918-
if(d.flags & DrawFlags::UseIBuffer && pipe->IA.IndexBuffer != NULL)
918+
if(d.flags & DrawFlags::Indexed && pipe->IA.IndexBuffer != NULL)
919919
m_ResourceUses[GetIDForResource(pipe->IA.IndexBuffer)].push_back(
920920
EventUsage(e, ResourceUsage::IndexBuffer));
921921

renderdoc/driver/d3d11/d3d11_context_wrap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,7 +3704,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexedInstanced(
37043704
draw.baseVertex = BaseVertexLocation;
37053705
draw.instanceOffset = StartInstanceLocation;
37063706

3707-
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer;
3707+
draw.flags |= DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed;
37083708

37093709
AddDrawcall(draw, true);
37103710
}
@@ -3840,7 +3840,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexed(SerialiserType &ser, UINT
38403840
draw.baseVertex = BaseVertexLocation;
38413841
draw.indexOffset = StartIndexLocation;
38423842

3843-
draw.flags |= DrawFlags::Drawcall | DrawFlags::UseIBuffer;
3843+
draw.flags |= DrawFlags::Drawcall | DrawFlags::Indexed;
38443844

38453845
AddDrawcall(draw, true);
38463846
}
@@ -4135,7 +4135,7 @@ bool WrappedID3D11DeviceContext::Serialise_DrawIndexedInstancedIndirect(Serialis
41354135
draw.name = name;
41364136

41374137
draw.flags |=
4138-
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::UseIBuffer | DrawFlags::Indirect;
4138+
DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect;
41394139

41404140
AddDrawcall(draw, true);
41414141
}

renderdoc/driver/d3d11/d3d11_pixelhistory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,7 @@ vector<PixelModification> D3D11Replay::PixelHistory(vector<EventUsage> events, R
24142414
m_pImmediateContext->Begin(testQueries[0]);
24152415

24162416
// do draw
2417-
if(draw->flags & DrawFlags::UseIBuffer)
2417+
if(draw->flags & DrawFlags::Indexed)
24182418
{
24192419
// TODO once pixel history distinguishes between instances, draw only the instance for
24202420
// this fragment

0 commit comments

Comments
 (0)