From 6f61cf097d4c5513cdf74cdf679df83a35c9e31a Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Wed, 2 Aug 2023 13:52:38 +0000 Subject: [PATCH] Bug 1828123: refactor(webidl): align args. naming for `GPUComputePassEncoder.dispatchWorkgroups` with spec. r=webgpu-reviewers,webidl,peterv,teoxoy Differential Revision: https://phabricator.services.mozilla.com/D185097 --- dom/webgpu/ComputePassEncoder.cpp | 8 +++++--- dom/webgpu/ComputePassEncoder.h | 3 ++- dom/webidl/WebGPU.webidl | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dom/webgpu/ComputePassEncoder.cpp b/dom/webgpu/ComputePassEncoder.cpp index eb9fc8e840a4..c9dffaba58c6 100644 --- a/dom/webgpu/ComputePassEncoder.cpp +++ b/dom/webgpu/ComputePassEncoder.cpp @@ -63,10 +63,12 @@ void ComputePassEncoder::SetPipeline(const ComputePipeline& aPipeline) { } } -void ComputePassEncoder::DispatchWorkgroups(uint32_t x, uint32_t y, - uint32_t z) { +void ComputePassEncoder::DispatchWorkgroups(uint32_t workgroupCountX, + uint32_t workgroupCountY, + uint32_t workgroupCountZ) { if (mValid) { - ffi::wgpu_compute_pass_dispatch_workgroups(mPass, x, y, z); + ffi::wgpu_compute_pass_dispatch_workgroups( + mPass, workgroupCountX, workgroupCountY, workgroupCountZ); } } diff --git a/dom/webgpu/ComputePassEncoder.h b/dom/webgpu/ComputePassEncoder.h index 76c0d87589da..273cfe92088c 100644 --- a/dom/webgpu/ComputePassEncoder.h +++ b/dom/webgpu/ComputePassEncoder.h @@ -58,7 +58,8 @@ class ComputePassEncoder final : public ObjectBase, // self void SetPipeline(const ComputePipeline& aPipeline); - void DispatchWorkgroups(uint32_t x, uint32_t y, uint32_t z); + void DispatchWorkgroups(uint32_t workgroupCountX, uint32_t workgroupCountY, + uint32_t workgroupCountZ); void DispatchWorkgroupsIndirect(const Buffer& aIndirectBuffer, uint64_t aIndirectOffset); diff --git a/dom/webidl/WebGPU.webidl b/dom/webidl/WebGPU.webidl index f8d1a7f44383..2a07d5147f9a 100644 --- a/dom/webidl/WebGPU.webidl +++ b/dom/webidl/WebGPU.webidl @@ -916,7 +916,7 @@ interface mixin GPUProgrammablePassEncoder { Exposed=(Window /* ,DedicatedWorker */), SecureContext] interface GPUComputePassEncoder { undefined setPipeline(GPUComputePipeline pipeline); - undefined dispatchWorkgroups(GPUSize32 x, optional GPUSize32 y = 1, optional GPUSize32 z = 1); + undefined dispatchWorkgroups(GPUSize32 workgroupCountX, optional GPUSize32 workgroupCountY = 1, optional GPUSize32 workgroupCountZ = 1); [Pref="dom.webgpu.indirect-dispatch.enabled"] undefined dispatchWorkgroupsIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);