Use the default values for Dispatch in examples and tests Bug: dawn:22 Change-Id: I4f83b966ee73ed92dc6648e3c59fac1be89031e1 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/18381 Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp index b7e147f..9d89cee 100644 --- a/src/tests/end2end/BindGroupTests.cpp +++ b/src/tests/end2end/BindGroupTests.cpp
@@ -29,7 +29,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); return encoder.Finish(); }
diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index 4d5e953..569c82b 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
@@ -74,7 +74,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(kInstances, 1, 1); + pass.Dispatch(kInstances); pass.EndPass(); commands = encoder.Finish();
diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp index 446a5e9..980735d 100644 --- a/src/tests/end2end/ComputeSharedMemoryTests.cpp +++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp
@@ -56,7 +56,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); commands = encoder.Finish();
diff --git a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp index 22fa4a3..5c8b2e3 100644 --- a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp +++ b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
@@ -54,7 +54,7 @@ pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); for (uint32_t i = 0; i < kIterations; ++i) { - pass.Dispatch(kNumValues, 1, 1); + pass.Dispatch(kNumValues); } pass.EndPass(); wgpu::CommandBuffer commands = encoder.Finish(); @@ -115,9 +115,9 @@ for (uint32_t i = 0; i < kIterations / 2; ++i) { pass.SetBindGroup(0, bindGroups[0]); - pass.Dispatch(kNumValues, 1, 1); + pass.Dispatch(kNumValues); pass.SetBindGroup(0, bindGroups[1]); - pass.Dispatch(kNumValues, 1, 1); + pass.Dispatch(kNumValues); } pass.EndPass(); wgpu::CommandBuffer commands = encoder.Finish(); @@ -181,7 +181,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroups[b]); - pass.Dispatch(kNumValues, 1, 1); + pass.Dispatch(kNumValues); pass.EndPass(); }
diff --git a/src/tests/end2end/DynamicBufferOffsetTests.cpp b/src/tests/end2end/DynamicBufferOffsetTests.cpp index 7d8c534..1798242 100644 --- a/src/tests/end2end/DynamicBufferOffsetTests.cpp +++ b/src/tests/end2end/DynamicBufferOffsetTests.cpp
@@ -264,7 +264,7 @@ wgpu::ComputePassEncoder computePassEncoder = commandEncoder.BeginComputePass(); computePassEncoder.SetPipeline(pipeline); computePassEncoder.SetBindGroup(0, mBindGroups[0], offsets.size(), offsets.data()); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.EndPass(); wgpu::CommandBuffer commands = commandEncoder.Finish(); queue.Submit(1, &commands); @@ -284,7 +284,7 @@ wgpu::ComputePassEncoder computePassEncoder = commandEncoder.BeginComputePass(); computePassEncoder.SetPipeline(pipeline); computePassEncoder.SetBindGroup(0, mBindGroups[0], offsets.size(), offsets.data()); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.EndPass(); wgpu::CommandBuffer commands = commandEncoder.Finish(); queue.Submit(1, &commands); @@ -339,10 +339,10 @@ wgpu::ComputePassEncoder computePassEncoder = commandEncoder.BeginComputePass(); computePassEncoder.SetPipeline(pipeline); computePassEncoder.SetBindGroup(0, mBindGroups[0], offsets.size(), offsets.data()); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.SetPipeline(testPipeline); computePassEncoder.SetBindGroup(1, mBindGroups[1]); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.EndPass(); wgpu::CommandBuffer commands = commandEncoder.Finish(); queue.Submit(1, &commands); @@ -392,9 +392,9 @@ wgpu::ComputePassEncoder computePassEncoder = commandEncoder.BeginComputePass(); computePassEncoder.SetPipeline(pipeline); computePassEncoder.SetBindGroup(0, mBindGroups[0], offsets.size(), offsets.data()); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.SetBindGroup(0, mBindGroups[0], testOffsets.size(), testOffsets.data()); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.EndPass(); wgpu::CommandBuffer commands = commandEncoder.Finish(); queue.Submit(1, &commands);
diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp index a246244..d396a5f 100644 --- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp +++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -111,7 +111,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(compute); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); } @@ -183,7 +183,7 @@ wgpu::ComputePassEncoder pass1 = encoder.BeginComputePass(); pass1.SetPipeline(compute); pass1.SetBindGroup(0, bindGroup1); - pass1.Dispatch(1, 1, 1); + pass1.Dispatch(1); pass1.EndPass(); wgpu::CommandBuffer commands = encoder.Finish(); @@ -214,7 +214,7 @@ wgpu::ComputePassEncoder pass0 = encoder.BeginComputePass(); pass0.SetPipeline(compute); pass0.SetBindGroup(0, bindGroup1); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); // Read that data in render pass. @@ -318,7 +318,7 @@ wgpu::ComputePassEncoder pass0 = encoder0.BeginComputePass(); pass0.SetPipeline(compute); pass0.SetBindGroup(0, computeBindGroup); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); // Read that data in render pass. @@ -355,7 +355,7 @@ wgpu::ComputePassEncoder pass0 = encoder0.BeginComputePass(); pass0.SetPipeline(compute); pass0.SetBindGroup(0, computeBindGroup); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); cb[0] = encoder0.Finish(); @@ -394,7 +394,7 @@ wgpu::ComputePassEncoder pass0 = encoder0.BeginComputePass(); pass0.SetPipeline(compute); pass0.SetBindGroup(0, computeBindGroup); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); cb[0] = encoder0.Finish(); queue.Submit(1, &cb[0]); @@ -499,7 +499,7 @@ wgpu::ComputePassEncoder pass0 = encoder.BeginComputePass(); pass0.SetPipeline(cp); pass0.SetBindGroup(0, bindGroup0); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); // Create pipeline, bind group, and reuse buffers in render pass. @@ -621,7 +621,7 @@ wgpu::ComputePassEncoder pass0 = encoder.BeginComputePass(); pass0.SetPipeline(cp); pass0.SetBindGroup(0, bindGroup0); - pass0.Dispatch(1, 1, 1); + pass0.Dispatch(1); pass0.EndPass(); // Create pipeline, bind group, and reuse the buffer in render pass.
diff --git a/src/tests/end2end/OpArrayLengthTests.cpp b/src/tests/end2end/OpArrayLengthTests.cpp index e2bf52b..fcd60ef 100644 --- a/src/tests/end2end/OpArrayLengthTests.cpp +++ b/src/tests/end2end/OpArrayLengthTests.cpp
@@ -135,7 +135,7 @@ pass.SetPipeline(pipeline); pass.SetBindGroup(0, mBindGroup); pass.SetBindGroup(1, resultBindGroup); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); wgpu::CommandBuffer commands = encoder.Finish();
diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp index c5b15ba..52d7094 100644 --- a/src/tests/end2end/TextureZeroInitTests.cpp +++ b/src/tests/end2end/TextureZeroInitTests.cpp
@@ -616,7 +616,7 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetPipeline(computePipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); wgpu::CommandBuffer commands = encoder.Finish(); EXPECT_LAZY_CLEAR(1u, queue.Submit(1, &commands));
diff --git a/src/tests/unittests/validation/BindGroupValidationTests.cpp b/src/tests/unittests/validation/BindGroupValidationTests.cpp index b741e14..c6d7715 100644 --- a/src/tests/unittests/validation/BindGroupValidationTests.cpp +++ b/src/tests/unittests/validation/BindGroupValidationTests.cpp
@@ -835,7 +835,7 @@ wgpu::ComputePassEncoder computePassEncoder = commandEncoder.BeginComputePass(); computePassEncoder.SetPipeline(computePipeline); computePassEncoder.SetBindGroup(0, bindGroup, count, offsets); - computePassEncoder.Dispatch(1, 1, 1); + computePassEncoder.Dispatch(1); computePassEncoder.EndPass(); if (!expectation) { ASSERT_DEVICE_ERROR(commandEncoder.Finish());
diff --git a/src/tests/unittests/validation/ComputePassValidationTests.cpp b/src/tests/unittests/validation/ComputePassValidationTests.cpp index b9f9e94..851c519 100644 --- a/src/tests/unittests/validation/ComputePassValidationTests.cpp +++ b/src/tests/unittests/validation/ComputePassValidationTests.cpp
@@ -56,8 +56,8 @@ pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); + pass.Dispatch(1); pass.EndPass(); ASSERT_DEVICE_ERROR(encoder.Finish()); @@ -95,8 +95,8 @@ pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroup); - pass.Dispatch(1, 1, 1); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); + pass.Dispatch(1); pass.EndPass(); encoder.Finish(); @@ -137,10 +137,10 @@ pass.SetPipeline(pipeline); pass.SetBindGroup(0, bindGroupA); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.SetBindGroup(0, bindGroupB); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); encoder.Finish();
diff --git a/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp b/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp index fb034c6..c765cc9 100644 --- a/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp +++ b/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp
@@ -260,10 +260,10 @@ wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); pass.SetBindGroup(0, bg0); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.SetBindGroup(0, bg1); - pass.Dispatch(1, 1, 1); + pass.Dispatch(1); pass.EndPass(); ASSERT_DEVICE_ERROR(encoder.Finish());