Make the offset of SetIndexBuffer default to 0
BUG=dawn:22
Change-Id: Icc4f03c3f49b610ef5f620b4c26a6ae24ed6c774
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12040
Reviewed-by: François Beaufort <beaufort.francois@gmail.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/dawn.json b/dawn.json
index 588436a..81d9914 100644
--- a/dawn.json
+++ b/dawn.json
@@ -891,7 +891,7 @@
"name": "set index buffer",
"args": [
{"name": "buffer", "type": "buffer"},
- {"name": "offset", "type": "uint64_t"}
+ {"name": "offset", "type": "uint64_t", "default": "0"}
]
},
{
@@ -1076,7 +1076,7 @@
"name": "set index buffer",
"args": [
{"name": "buffer", "type": "buffer"},
- {"name": "offset", "type": "uint64_t"}
+ {"name": "offset", "type": "uint64_t", "default": "0"}
]
},
{
diff --git a/examples/CppHelloTriangle.cpp b/examples/CppHelloTriangle.cpp
index 0fd317c..2437e3a 100644
--- a/examples/CppHelloTriangle.cpp
+++ b/examples/CppHelloTriangle.cpp
@@ -162,7 +162,7 @@
pass.SetPipeline(pipeline);
pass.SetBindGroup(0, bindGroup);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(3, 1, 0, 0, 0);
pass.EndPass();
}
diff --git a/examples/CubeReflection.cpp b/examples/CubeReflection.cpp
index 3455931..ac712a6 100644
--- a/examples/CubeReflection.cpp
+++ b/examples/CubeReflection.cpp
@@ -273,7 +273,7 @@
pass.SetPipeline(pipeline);
pass.SetBindGroup(0, bindGroup[0]);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(36, 1, 0, 0, 0);
pass.SetStencilReference(0x1);
diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp
index 0d8a33b..fa3710a 100644
--- a/src/tests/end2end/IndexFormatTests.cpp
+++ b/src/tests/end2end/IndexFormatTests.cpp
@@ -79,7 +79,7 @@
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(3, 1, 0, 0, 0);
pass.EndPass();
}
@@ -106,7 +106,7 @@
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(3, 1, 0, 0, 0);
pass.EndPass();
}
@@ -156,7 +156,7 @@
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(7, 1, 0, 0, 0);
pass.EndPass();
}
@@ -198,7 +198,7 @@
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexed(7, 1, 0, 0, 0);
pass.EndPass();
}
@@ -233,7 +233,7 @@
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline16);
pass.SetVertexBuffer(0, vertexBuffer);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.SetPipeline(pipeline32);
pass.DrawIndexed(3, 1, 0, 0, 0);
pass.EndPass();
@@ -262,7 +262,7 @@
dawn::CommandEncoder encoder = device.CreateCommandEncoder();
{
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer);
pass.DrawIndexed(3, 1, 0, 0, 0);
diff --git a/src/tests/unittests/validation/CommandBufferValidationTests.cpp b/src/tests/unittests/validation/CommandBufferValidationTests.cpp
index c51fa67..e78bec8 100644
--- a/src/tests/unittests/validation/CommandBufferValidationTests.cpp
+++ b/src/tests/unittests/validation/CommandBufferValidationTests.cpp
@@ -194,7 +194,7 @@
dawn::CommandEncoder encoder = device.CreateCommandEncoder();
DummyRenderPass dummyRenderPass(device);
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&dummyRenderPass);
- pass.SetIndexBuffer(buffer, 0);
+ pass.SetIndexBuffer(buffer);
pass.SetVertexBuffer(0, buffer);
pass.EndPass();
encoder.Finish();
@@ -217,7 +217,7 @@
dawn::CommandEncoder encoder = device.CreateCommandEncoder();
DummyRenderPass dummyRenderPass(device);
dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&dummyRenderPass);
- pass.SetIndexBuffer(buffer, 0);
+ pass.SetIndexBuffer(buffer);
pass.SetBindGroup(0, bg);
pass.EndPass();
ASSERT_DEVICE_ERROR(encoder.Finish());
diff --git a/src/tests/unittests/validation/DrawIndirectValidationTests.cpp b/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
index 660138b..aa44305 100644
--- a/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
+++ b/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
@@ -84,7 +84,7 @@
uint32_t zeros[100] = {};
dawn::Buffer indexBuffer =
utils::CreateBufferFromData(device, zeros, sizeof(zeros), dawn::BufferUsage::Index);
- pass.SetIndexBuffer(indexBuffer, 0);
+ pass.SetIndexBuffer(indexBuffer);
pass.DrawIndexedIndirect(indirectBuffer, indirectOffset);
} else {
pass.DrawIndirect(indirectBuffer, indirectOffset);
