encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

baseVertex in drawIndexed() should be int32, not uint32 

baseVertex in drawIndexed() is int32 in web idl. But it is uint32 in Dawn
project. I also checked the native Graphics API sets. baseVertex is int32
on all native APIs (D3D12, Vulkan, Metal). So this feature in web idl is
definitely correct.

This small change makes dawn match web idl for this feature. And it also
adds a couple of tests to cover negative baseVertex.

BUG=dawn:135
TEST=dawn_end2end_tests

Change-Id: I642c96faed9103c8392979f3714527ed0aac4089
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/6442
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Yunchao He 2019-04-12 07:58:44 +00:00 committed by Commit Bot service account
parent c33a8c1885
commit 0c227e21d1
5 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dawn.json
View File

@ -776,7 +776,7 @@
{"name": "index count", "type": "uint32_t"},
{"name": "instance count", "type": "uint32_t"},
{"name": "first index", "type": "uint32_t"},
{"name": "base vertex", "type": "uint32_t"},
{"name": "base vertex", "type": "int32_t"},
{"name": "first instance", "type": "uint32_t"}
]
},

2
src/dawn_native/Commands.h
View File

@ -143,7 +143,7 @@ namespace dawn_native {
uint32_t indexCount;
uint32_t instanceCount;
uint32_t firstIndex;
uint32_t baseVertex;
int32_t baseVertex;
uint32_t firstInstance;
};

2
src/dawn_native/RenderPassEncoder.cpp
View File

@ -60,7 +60,7 @@ namespace dawn_native {
void RenderPassEncoderBase::DrawIndexed(uint32_t indexCount,
uint32_t instanceCount,
uint32_t firstIndex,
uint32_t baseVertex,
int32_t baseVertex,
uint32_t firstInstance) {
if (mTopLevelEncoder->ConsumedError(ValidateCanRecordCommands())) {
return;

2
src/dawn_native/RenderPassEncoder.h
View File

@ -40,7 +40,7 @@ namespace dawn_native {
void DrawIndexed(uint32_t vertexCount,
uint32_t instanceCount,
uint32_t firstIndex,
uint32_t baseVertex,
int32_t baseVertex,
uint32_t firstInstance);
void SetPipeline(RenderPipelineBase* pipeline);

37
src/tests/end2end/DrawIndexedTests.cpp
View File

@ -67,9 +67,11 @@ class DrawIndexedTest : public DawnTest {
1.0f, -1.0f, 0.0f, 1.0f,
-1.0f, 1.0f, 0.0f, 1.0f
});
indexBuffer = utils::CreateBufferFromData<uint32_t>(device, dawn::BufferUsageBit::Index, {
0, 1, 2, 0, 3, 1
});
indexBuffer = utils::CreateBufferFromData<uint32_t>(
device, dawn::BufferUsageBit::Index,
{0, 1, 2, 0, 3, 1,
// The indices below are added to test negatve baseVertex
0 + 4, 1 + 4, 2 + 4, 0 + 4, 3 + 4, 1 + 4});
}
utils::BasicRenderPass renderPass;
@ -77,8 +79,13 @@ class DrawIndexedTest : public DawnTest {
dawn::Buffer vertexBuffer;
dawn::Buffer indexBuffer;
void Test(uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex,
uint32_t baseVertex, uint32_t firstInstance, RGBA8 bottomLeftExpected,
void Test(uint32_t indexCount,
uint32_t instanceCount,
uint32_t firstIndex,
int32_t baseVertex,
uint32_t firstInstance,
uint64_t bufferOffset,
RGBA8 bottomLeftExpected,
RGBA8 topRightExpected) {
uint64_t zeroOffset = 0;
dawn::CommandEncoder encoder = device.CreateCommandEncoder();
@ -87,7 +94,7 @@ class DrawIndexedTest : public DawnTest {
&renderPass.renderPassInfo);
pass.SetPipeline(pipeline);
pass.SetVertexBuffers(0, 1, &vertexBuffer, &zeroOffset);
pass.SetIndexBuffer(indexBuffer, 0);
pass.SetIndexBuffer(indexBuffer, bufferOffset);
pass.DrawIndexed(indexCount, instanceCount, firstIndex, baseVertex, firstInstance);
pass.EndPass();
}
@ -107,13 +114,13 @@ TEST_P(DrawIndexedTest, Uint32) {
RGBA8 notFilled(0, 0, 0, 0);
// Test a draw with no indices.
Test(0, 0, 0, 0, 0, notFilled, notFilled);
Test(0, 0, 0, 0, 0, 0, notFilled, notFilled);
// Test a draw with only the first 3 indices of the first quad (bottom left triangle)
Test(3, 1, 0, 0, 0, filled, notFilled);
Test(3, 1, 0, 0, 0, 0, filled, notFilled);
// Test a draw with only the last 3 indices of the first quad (top right triangle)
Test(3, 1, 3, 0, 0, notFilled, filled);
Test(3, 1, 3, 0, 0, 0, notFilled, filled);
// Test a draw with all 6 indices (both triangles).
Test(6, 1, 0, 0, 0, filled, filled);
Test(6, 1, 0, 0, 0, 0, filled, filled);
}
// Test the parameter 'baseVertex' of DrawIndexed() works.
@ -122,9 +129,15 @@ TEST_P(DrawIndexedTest, BaseVertex) {
RGBA8 notFilled(0, 0, 0, 0);
// Test a draw with only the first 3 indices of the second quad (top right triangle)
Test(3, 1, 0, 4, 0, notFilled, filled);
Test(3, 1, 0, 4, 0, 0, notFilled, filled);
// Test a draw with only the last 3 indices of the second quad (bottom left triangle)
Test(3, 1, 3, 4, 0, filled, notFilled);
Test(3, 1, 3, 4, 0, 0, filled, notFilled);
// Test negative baseVertex
// Test a draw with only the first 3 indices of the first quad (bottom left triangle)
Test(3, 1, 0, -4, 0, 6 * sizeof(uint32_t), filled, notFilled);
// Test a draw with only the last 3 indices of the first quad (top right triangle)
Test(3, 1, 3, -4, 0, 6 * sizeof(uint32_t), notFilled, filled);
}
DAWN_INSTANTIATE_TEST(DrawIndexedTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend);