Rename draw commands to match WebGPU IDL
BUG=dawn:51
Change-Id: I2a78f4e77c54aeae48d3fb78bf4701352ff40529
Reviewed-on: https://dawn-review.googlesource.com/c/3040
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
diff --git a/src/dawn_native/CommandBuffer.cpp b/src/dawn_native/CommandBuffer.cpp
index 6fdfb71..88a013e 100644
--- a/src/dawn_native/CommandBuffer.cpp
+++ b/src/dawn_native/CommandBuffer.cpp
@@ -515,14 +515,14 @@
return {};
} break;
- case Command::DrawArrays: {
- mIterator.NextCommand<DrawArraysCmd>();
- DAWN_TRY(persistentState.ValidateCanDrawArrays());
+ case Command::Draw: {
+ mIterator.NextCommand<DrawCmd>();
+ DAWN_TRY(persistentState.ValidateCanDraw());
} break;
- case Command::DrawElements: {
- mIterator.NextCommand<DrawElementsCmd>();
- DAWN_TRY(persistentState.ValidateCanDrawElements());
+ case Command::DrawIndexed: {
+ mIterator.NextCommand<DrawIndexedCmd>();
+ DAWN_TRY(persistentState.ValidateCanDrawIndexed());
} break;
case Command::SetRenderPipeline: {
diff --git a/src/dawn_native/CommandBufferStateTracker.cpp b/src/dawn_native/CommandBufferStateTracker.cpp
index 44799ac..9a7fdd9 100644
--- a/src/dawn_native/CommandBufferStateTracker.cpp
+++ b/src/dawn_native/CommandBufferStateTracker.cpp
@@ -38,11 +38,11 @@
static constexpr CommandBufferStateTracker::ValidationAspects kDispatchAspects =
1 << VALIDATION_ASPECT_PIPELINE | 1 << VALIDATION_ASPECT_BIND_GROUPS;
- static constexpr CommandBufferStateTracker::ValidationAspects kDrawArraysAspects =
+ static constexpr CommandBufferStateTracker::ValidationAspects kDrawAspects =
1 << VALIDATION_ASPECT_PIPELINE | 1 << VALIDATION_ASPECT_BIND_GROUPS |
1 << VALIDATION_ASPECT_VERTEX_BUFFERS;
- static constexpr CommandBufferStateTracker::ValidationAspects kDrawElementsAspects =
+ static constexpr CommandBufferStateTracker::ValidationAspects kDrawIndexedAspects =
1 << VALIDATION_ASPECT_PIPELINE | 1 << VALIDATION_ASPECT_BIND_GROUPS |
1 << VALIDATION_ASPECT_VERTEX_BUFFERS | 1 << VALIDATION_ASPECT_INDEX_BUFFER;
@@ -53,12 +53,12 @@
return ValidateOperation(kDispatchAspects);
}
- MaybeError CommandBufferStateTracker::ValidateCanDrawArrays() {
- return ValidateOperation(kDrawArraysAspects);
+ MaybeError CommandBufferStateTracker::ValidateCanDraw() {
+ return ValidateOperation(kDrawAspects);
}
- MaybeError CommandBufferStateTracker::ValidateCanDrawElements() {
- return ValidateOperation(kDrawElementsAspects);
+ MaybeError CommandBufferStateTracker::ValidateCanDrawIndexed() {
+ return ValidateOperation(kDrawIndexedAspects);
}
MaybeError CommandBufferStateTracker::ValidateOperation(ValidationAspects requiredAspects) {
diff --git a/src/dawn_native/CommandBufferStateTracker.h b/src/dawn_native/CommandBufferStateTracker.h
index 9dd1edb..2419ded 100644
--- a/src/dawn_native/CommandBufferStateTracker.h
+++ b/src/dawn_native/CommandBufferStateTracker.h
@@ -29,8 +29,8 @@
public:
// Non-state-modifying validation functions
MaybeError ValidateCanDispatch();
- MaybeError ValidateCanDrawArrays();
- MaybeError ValidateCanDrawElements();
+ MaybeError ValidateCanDraw();
+ MaybeError ValidateCanDrawIndexed();
// State-modifying methods
void SetComputePipeline(ComputePipelineBase* pipeline);
diff --git a/src/dawn_native/Commands.cpp b/src/dawn_native/Commands.cpp
index 455675a..6443fc8 100644
--- a/src/dawn_native/Commands.cpp
+++ b/src/dawn_native/Commands.cpp
@@ -53,13 +53,13 @@
DispatchCmd* dispatch = commands->NextCommand<DispatchCmd>();
dispatch->~DispatchCmd();
} break;
- case Command::DrawArrays: {
- DrawArraysCmd* draw = commands->NextCommand<DrawArraysCmd>();
- draw->~DrawArraysCmd();
+ case Command::Draw: {
+ DrawCmd* draw = commands->NextCommand<DrawCmd>();
+ draw->~DrawCmd();
} break;
- case Command::DrawElements: {
- DrawElementsCmd* draw = commands->NextCommand<DrawElementsCmd>();
- draw->~DrawElementsCmd();
+ case Command::DrawIndexed: {
+ DrawIndexedCmd* draw = commands->NextCommand<DrawIndexedCmd>();
+ draw->~DrawIndexedCmd();
} break;
case Command::EndComputePass: {
EndComputePassCmd* cmd = commands->NextCommand<EndComputePassCmd>();
@@ -142,12 +142,12 @@
commands->NextCommand<DispatchCmd>();
break;
- case Command::DrawArrays:
- commands->NextCommand<DrawArraysCmd>();
+ case Command::Draw:
+ commands->NextCommand<DrawCmd>();
break;
- case Command::DrawElements:
- commands->NextCommand<DrawElementsCmd>();
+ case Command::DrawIndexed:
+ commands->NextCommand<DrawIndexedCmd>();
break;
case Command::EndComputePass:
diff --git a/src/dawn_native/Commands.h b/src/dawn_native/Commands.h
index 6ddf58d..4625774 100644
--- a/src/dawn_native/Commands.h
+++ b/src/dawn_native/Commands.h
@@ -33,8 +33,8 @@
CopyBufferToTexture,
CopyTextureToBuffer,
Dispatch,
- DrawArrays,
- DrawElements,
+ Draw,
+ DrawIndexed,
EndComputePass,
EndRenderPass,
SetComputePipeline,
@@ -93,14 +93,14 @@
uint32_t z;
};
- struct DrawArraysCmd {
+ struct DrawCmd {
uint32_t vertexCount;
uint32_t instanceCount;
uint32_t firstVertex;
uint32_t firstInstance;
};
- struct DrawElementsCmd {
+ struct DrawIndexedCmd {
uint32_t indexCount;
uint32_t instanceCount;
uint32_t firstIndex;
diff --git a/src/dawn_native/RenderPassEncoder.cpp b/src/dawn_native/RenderPassEncoder.cpp
index e8f8ac5..ad94bc1 100644
--- a/src/dawn_native/RenderPassEncoder.cpp
+++ b/src/dawn_native/RenderPassEncoder.cpp
@@ -29,32 +29,32 @@
: ProgrammablePassEncoder(device, topLevelBuilder, allocator) {
}
- void RenderPassEncoderBase::DrawArrays(uint32_t vertexCount,
- uint32_t instanceCount,
- uint32_t firstVertex,
- uint32_t firstInstance) {
+ void RenderPassEncoderBase::Draw(uint32_t vertexCount,
+ uint32_t instanceCount,
+ uint32_t firstVertex,
+ uint32_t firstInstance) {
if (mTopLevelBuilder->ConsumedError(ValidateCanRecordCommands())) {
return;
}
- DrawArraysCmd* draw = mAllocator->Allocate<DrawArraysCmd>(Command::DrawArrays);
- new (draw) DrawArraysCmd;
+ DrawCmd* draw = mAllocator->Allocate<DrawCmd>(Command::Draw);
+ new (draw) DrawCmd;
draw->vertexCount = vertexCount;
draw->instanceCount = instanceCount;
draw->firstVertex = firstVertex;
draw->firstInstance = firstInstance;
}
- void RenderPassEncoderBase::DrawElements(uint32_t indexCount,
- uint32_t instanceCount,
- uint32_t firstIndex,
- uint32_t firstInstance) {
+ void RenderPassEncoderBase::DrawIndexed(uint32_t indexCount,
+ uint32_t instanceCount,
+ uint32_t firstIndex,
+ uint32_t firstInstance) {
if (mTopLevelBuilder->ConsumedError(ValidateCanRecordCommands())) {
return;
}
- DrawElementsCmd* draw = mAllocator->Allocate<DrawElementsCmd>(Command::DrawElements);
- new (draw) DrawElementsCmd;
+ DrawIndexedCmd* draw = mAllocator->Allocate<DrawIndexedCmd>(Command::DrawIndexed);
+ new (draw) DrawIndexedCmd;
draw->indexCount = indexCount;
draw->instanceCount = instanceCount;
draw->firstIndex = firstIndex;
diff --git a/src/dawn_native/RenderPassEncoder.h b/src/dawn_native/RenderPassEncoder.h
index c2bdad8..d8b618f 100644
--- a/src/dawn_native/RenderPassEncoder.h
+++ b/src/dawn_native/RenderPassEncoder.h
@@ -30,14 +30,14 @@
CommandBufferBuilder* topLevelBuilder,
CommandAllocator* allocator);
- void DrawArrays(uint32_t vertexCount,
- uint32_t instanceCount,
- uint32_t firstVertex,
- uint32_t firstInstance);
- void DrawElements(uint32_t vertexCount,
- uint32_t instanceCount,
- uint32_t firstIndex,
- uint32_t firstInstance);
+ void Draw(uint32_t vertexCount,
+ uint32_t instanceCount,
+ uint32_t firstVertex,
+ uint32_t firstInstance);
+ void DrawIndexed(uint32_t vertexCount,
+ uint32_t instanceCount,
+ uint32_t firstIndex,
+ uint32_t firstInstance);
void SetRenderPipeline(RenderPipelineBase* pipeline);
diff --git a/src/dawn_native/d3d12/CommandBufferD3D12.cpp b/src/dawn_native/d3d12/CommandBufferD3D12.cpp
index 8b90046..2044097 100644
--- a/src/dawn_native/d3d12/CommandBufferD3D12.cpp
+++ b/src/dawn_native/d3d12/CommandBufferD3D12.cpp
@@ -540,14 +540,14 @@
return;
} break;
- case Command::DrawArrays: {
- DrawArraysCmd* draw = mCommands.NextCommand<DrawArraysCmd>();
+ case Command::Draw: {
+ DrawCmd* draw = mCommands.NextCommand<DrawCmd>();
commandList->DrawInstanced(draw->vertexCount, draw->instanceCount,
draw->firstVertex, draw->firstInstance);
} break;
- case Command::DrawElements: {
- DrawElementsCmd* draw = mCommands.NextCommand<DrawElementsCmd>();
+ case Command::DrawIndexed: {
+ DrawIndexedCmd* draw = mCommands.NextCommand<DrawIndexedCmd>();
commandList->DrawIndexedInstanced(draw->indexCount, draw->instanceCount,
draw->firstIndex, 0, draw->firstInstance);
} break;
diff --git a/src/dawn_native/metal/CommandBufferMTL.mm b/src/dawn_native/metal/CommandBufferMTL.mm
index 472277f..03066ed 100644
--- a/src/dawn_native/metal/CommandBufferMTL.mm
+++ b/src/dawn_native/metal/CommandBufferMTL.mm
@@ -403,8 +403,8 @@
return;
} break;
- case Command::DrawArrays: {
- DrawArraysCmd* draw = mCommands.NextCommand<DrawArraysCmd>();
+ case Command::Draw: {
+ DrawCmd* draw = mCommands.NextCommand<DrawCmd>();
[encoder drawPrimitives:lastPipeline->GetMTLPrimitiveTopology()
vertexStart:draw->firstVertex
@@ -413,8 +413,8 @@
baseInstance:draw->firstInstance];
} break;
- case Command::DrawElements: {
- DrawElementsCmd* draw = mCommands.NextCommand<DrawElementsCmd>();
+ case Command::DrawIndexed: {
+ DrawIndexedCmd* draw = mCommands.NextCommand<DrawIndexedCmd>();
size_t formatSize = IndexFormatSize(lastPipeline->GetIndexFormat());
[encoder
diff --git a/src/dawn_native/opengl/CommandBufferGL.cpp b/src/dawn_native/opengl/CommandBufferGL.cpp
index 080c4a4..7ac7bdf 100644
--- a/src/dawn_native/opengl/CommandBufferGL.cpp
+++ b/src/dawn_native/opengl/CommandBufferGL.cpp
@@ -583,8 +583,8 @@
return;
} break;
- case Command::DrawArrays: {
- DrawArraysCmd* draw = mCommands.NextCommand<DrawArraysCmd>();
+ case Command::Draw: {
+ DrawCmd* draw = mCommands.NextCommand<DrawCmd>();
pushConstants.Apply(lastPipeline, lastPipeline);
inputBuffers.Apply();
@@ -600,8 +600,8 @@
}
} break;
- case Command::DrawElements: {
- DrawElementsCmd* draw = mCommands.NextCommand<DrawElementsCmd>();
+ case Command::DrawIndexed: {
+ DrawIndexedCmd* draw = mCommands.NextCommand<DrawIndexedCmd>();
pushConstants.Apply(lastPipeline, lastPipeline);
inputBuffers.Apply();
diff --git a/src/dawn_native/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp
index 23dfd55..9ebdb70 100644
--- a/src/dawn_native/vulkan/CommandBufferVk.cpp
+++ b/src/dawn_native/vulkan/CommandBufferVk.cpp
@@ -320,16 +320,16 @@
return;
} break;
- case Command::DrawArrays: {
- DrawArraysCmd* draw = mCommands.NextCommand<DrawArraysCmd>();
+ case Command::Draw: {
+ DrawCmd* draw = mCommands.NextCommand<DrawCmd>();
descriptorSets.Flush(device, commands, VK_PIPELINE_BIND_POINT_GRAPHICS);
device->fn.CmdDraw(commands, draw->vertexCount, draw->instanceCount,
draw->firstVertex, draw->firstInstance);
} break;
- case Command::DrawElements: {
- DrawElementsCmd* draw = mCommands.NextCommand<DrawElementsCmd>();
+ case Command::DrawIndexed: {
+ DrawIndexedCmd* draw = mCommands.NextCommand<DrawIndexedCmd>();
descriptorSets.Flush(device, commands, VK_PIPELINE_BIND_POINT_GRAPHICS);
uint32_t vertexOffset = 0;
