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

Add tests for zero sized index buffer out of bounds draw test 

Bug: dawn:622
Change-Id: I9601a7d6fec246abd7a0941fcfc4253df03376a3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/44240
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>
This commit is contained in:
Shrek Shao 2021-03-10 18:02:48 +00:00 committed by Commit Bot service account
parent 54c9b8244d
commit 6fc6fce636
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,12 +66,15 @@ class DrawIndexedTest : public DawnTest {
{0, 1, 2, 0, 3, 1, {0, 1, 2, 0, 3, 1,
// The indices below are added to test negatve baseVertex // The indices below are added to test negatve baseVertex
0 + 4, 1 + 4, 2 + 4, 0 + 4, 3 + 4, 1 + 4}); 0 + 4, 1 + 4, 2 + 4, 0 + 4, 3 + 4, 1 + 4});
zeroSizedIndexBuffer =
utils::CreateBufferFromData<uint32_t>(device, wgpu::BufferUsage::Index, {});
} }
utils::BasicRenderPass renderPass; utils::BasicRenderPass renderPass;
wgpu::RenderPipeline pipeline; wgpu::RenderPipeline pipeline;
wgpu::Buffer vertexBuffer; wgpu::Buffer vertexBuffer;
wgpu::Buffer indexBuffer; wgpu::Buffer indexBuffer;
wgpu::Buffer zeroSizedIndexBuffer;
void Test(uint32_t indexCount, void Test(uint32_t indexCount,
uint32_t instanceCount, uint32_t instanceCount,
@ -81,12 +84,34 @@ class DrawIndexedTest : public DawnTest {
uint64_t bufferOffset, uint64_t bufferOffset,
RGBA8 bottomLeftExpected, RGBA8 bottomLeftExpected,
RGBA8 topRightExpected) { RGBA8 topRightExpected) {
// Regular draw with a reasonable index buffer
TestImplementation(indexCount, instanceCount, firstIndex, baseVertex, firstInstance,
bufferOffset, indexBuffer, bottomLeftExpected, topRightExpected);
}
void TestZeroSizedIndexBufferDraw(uint32_t indexCount,
uint32_t firstIndex,
RGBA8 bottomLeftExpected,
RGBA8 topRightExpected) {
TestImplementation(indexCount, 1, firstIndex, 0, 0, 0, zeroSizedIndexBuffer,
bottomLeftExpected, topRightExpected);
}
void TestImplementation(uint32_t indexCount,
uint32_t instanceCount,
uint32_t firstIndex,
int32_t baseVertex,
uint32_t firstInstance,
uint64_t bufferOffset,
const wgpu::Buffer& curIndexBuffer,
RGBA8 bottomLeftExpected,
RGBA8 topRightExpected) {
wgpu::CommandEncoder encoder = device.CreateCommandEncoder(); wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
{ {
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo); wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
pass.SetPipeline(pipeline); pass.SetPipeline(pipeline);
pass.SetVertexBuffer(0, vertexBuffer); pass.SetVertexBuffer(0, vertexBuffer);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32, bufferOffset); pass.SetIndexBuffer(curIndexBuffer, wgpu::IndexFormat::Uint32, bufferOffset);
pass.DrawIndexed(indexCount, instanceCount, firstIndex, baseVertex, firstInstance); pass.DrawIndexed(indexCount, instanceCount, firstIndex, baseVertex, firstInstance);
pass.EndPass(); pass.EndPass();
} }
@ -143,6 +168,16 @@ TEST_P(DrawIndexedTest, OutOfBounds) {
Test(2, 1, std::numeric_limits<uint32_t>::max(), 0, 0, 0, notFilled, notFilled); Test(2, 1, std::numeric_limits<uint32_t>::max(), 0, 0, 0, notFilled, notFilled);
} }
TEST_P(DrawIndexedTest, ZeroSizedIndexBuffer) {
RGBA8 notFilled(0, 0, 0, 0);
// IndexBuffer size is zero, so index access is always out of bounds
TestZeroSizedIndexBufferDraw(3, 1, notFilled, notFilled);
TestZeroSizedIndexBufferDraw(0, 1, notFilled, notFilled);
TestZeroSizedIndexBufferDraw(3, 0, notFilled, notFilled);
TestZeroSizedIndexBufferDraw(0, 0, notFilled, notFilled);
}
// Test the parameter 'baseVertex' of DrawIndexed() works. // Test the parameter 'baseVertex' of DrawIndexed() works.
TEST_P(DrawIndexedTest, BaseVertex) { TEST_P(DrawIndexedTest, BaseVertex) {
DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_base_vertex")); DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_base_vertex"));