encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-01 04:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SetIndex/VertexBuffer offset argument alignment constraints

Browse Source 
The vertex buffer alignment in particular is helps make the
implementation of programmable pulling much easier on Metal since the
vertex data will be able to be represented as array<u32>.

Bug: dawn:805
Change-Id: I2bf2742db3b8fa478be620c892925b8b75dc514c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/54659
Reviewed-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Corentin Wallez 2021-06-17 17:48:45 +00:00 committed by Dawn LUCI CQ
parent 75f554d973
commit 95aa7c5b29
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dawn_native/RenderEncoderBase.cpp
View File

@ -217,6 +217,11 @@ namespace dawn_native {
return DAWN_VALIDATION_ERROR("Index format must be specified");
}
if (offset % uint64_t(IndexFormatSize(format)) != 0) {
return DAWN_VALIDATION_ERROR(
"Offset must be a multiple of the index format size");
}
uint64_t bufferSize = buffer->GetSize();
if (offset > bufferSize) {
return DAWN_VALIDATION_ERROR("Offset larger than the buffer size");
@ -264,6 +269,10 @@ namespace dawn_native {
return DAWN_VALIDATION_ERROR("Vertex buffer slot out of bounds");
}
if (offset % 4 != 0) {
return DAWN_VALIDATION_ERROR("Offset must be a multiple of 4");
}
uint64_t bufferSize = buffer->GetSize();
if (offset > bufferSize) {
return DAWN_VALIDATION_ERROR("Offset larger than the buffer size");

36
src/tests/unittests/validation/IndexBufferValidationTests.cpp
View File

@ -224,3 +224,39 @@ TEST_F(IndexBufferValidationTest, InvalidUsage) {
ASSERT_DEVICE_ERROR(encoder.Finish());
}
}
// Check the alignment constraint on the index buffer offset.
TEST_F(IndexBufferValidationTest, OffsetAlignment) {
wgpu::Buffer indexBuffer =
utils::CreateBufferFromData<uint32_t>(device, wgpu::BufferUsage::Index, {0, 1, 2});
DummyRenderPass renderPass(device);
// Control cases: index buffer offset is a multiple of the index format size
{
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32, 0);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32, 4);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint16, 0);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint16, 2);
pass.EndPass();
encoder.Finish();
}
// Error case: index buffer offset isn't a multiple of 4 for IndexFormat::Uint32
{
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32, 2);
pass.EndPass();
ASSERT_DEVICE_ERROR(encoder.Finish());
}
// Error case: index buffer offset isn't a multiple of 2 for IndexFormat::Uint16
{
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint16, 1);
pass.EndPass();
ASSERT_DEVICE_ERROR(encoder.Finish());
}
}

26
src/tests/unittests/validation/VertexBufferValidationTests.cpp
View File

@ -328,3 +328,29 @@ TEST_F(VertexBufferValidationTest, InvalidUsage) {
ASSERT_DEVICE_ERROR(encoder.Finish());
}
}
// Check the alignment constraint on the index buffer offset.
TEST_F(VertexBufferValidationTest, OffsetAlignment) {
wgpu::Buffer vertexBuffer = MakeVertexBuffer();
DummyRenderPass renderPass(device);
// Control cases: vertex buffer offset is a multiple of 4
{
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
pass.SetVertexBuffer(0, vertexBuffer, 0);
pass.SetVertexBuffer(0, vertexBuffer, 4);
pass.SetVertexBuffer(0, vertexBuffer, 12);
pass.EndPass();
encoder.Finish();
}
// Error case: vertex buffer offset isn't a multiple of 4
{
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
pass.SetVertexBuffer(0, vertexBuffer, 2);
pass.EndPass();
ASSERT_DEVICE_ERROR(encoder.Finish());
}
}