diff --git a/src/library_sigs.js b/src/library_sigs.js index d7d796d6c2102..049ed2ac745e7 100644 --- a/src/library_sigs.js +++ b/src/library_sigs.js @@ -1653,7 +1653,7 @@ sigs = { wgpuQuerySetReference__sig: 'vp', wgpuQuerySetRelease__sig: 'vp', wgpuQuerySetSetLabel__sig: 'vpp', - wgpuQueueOnSubmittedWorkDone__sig: 'vpjpp', + wgpuQueueOnSubmittedWorkDone__sig: 'vppp', wgpuQueueReference__sig: 'vp', wgpuQueueRelease__sig: 'vp', wgpuQueueSetLabel__sig: 'vpp', diff --git a/src/library_webgpu.js b/src/library_webgpu.js index 6fd5d33dbc5cc..5496479d17d01 100644 --- a/src/library_webgpu.js +++ b/src/library_webgpu.js @@ -1570,11 +1570,8 @@ var LibraryWebGPU = { }, wgpuQueueOnSubmittedWorkDone__deps: ['$callUserCallback'], - wgpuQueueOnSubmittedWorkDone: (queueId, signalValue, callback, userdata) => { + wgpuQueueOnSubmittedWorkDone: (queueId, callback, userdata) => { var queue = WebGPU.mgrQueue.get(queueId); -#if ASSERTIONS - assert(signalValue == 0, 'signalValue not supported, must be 0'); -#endif {{{ runtimeKeepalivePush() }}} queue["onSubmittedWorkDone"]().then(() => { diff --git a/system/include/webgpu/webgpu.h b/system/include/webgpu/webgpu.h index 8fc744a450a32..b3e5218e12b8a 100644 --- a/system/include/webgpu/webgpu.h +++ b/system/include/webgpu/webgpu.h @@ -1459,7 +1459,7 @@ typedef void (*WGPUProcQuerySetReference)(WGPUQuerySet querySet) WGPU_FUNCTION_A typedef void (*WGPUProcQuerySetRelease)(WGPUQuerySet querySet) WGPU_FUNCTION_ATTRIBUTE; // Procs of Queue -typedef void (*WGPUProcQueueOnSubmittedWorkDone)(WGPUQueue queue, uint64_t signalValue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE; +typedef void (*WGPUProcQueueOnSubmittedWorkDone)(WGPUQueue queue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE; typedef void (*WGPUProcQueueSetLabel)(WGPUQueue queue, char const * label) WGPU_FUNCTION_ATTRIBUTE; typedef void (*WGPUProcQueueSubmit)(WGPUQueue queue, size_t commandCount, WGPUCommandBuffer const * commands) WGPU_FUNCTION_ATTRIBUTE; typedef void (*WGPUProcQueueWriteBuffer)(WGPUQueue queue, WGPUBuffer buffer, uint64_t bufferOffset, void const * data, size_t size) WGPU_FUNCTION_ATTRIBUTE; @@ -1698,7 +1698,7 @@ WGPU_EXPORT void wgpuQuerySetReference(WGPUQuerySet querySet) WGPU_FUNCTION_ATTR WGPU_EXPORT void wgpuQuerySetRelease(WGPUQuerySet querySet) WGPU_FUNCTION_ATTRIBUTE; // Methods of Queue -WGPU_EXPORT void wgpuQueueOnSubmittedWorkDone(WGPUQueue queue, uint64_t signalValue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE; +WGPU_EXPORT void wgpuQueueOnSubmittedWorkDone(WGPUQueue queue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE; WGPU_EXPORT void wgpuQueueSetLabel(WGPUQueue queue, char const * label) WGPU_FUNCTION_ATTRIBUTE; WGPU_EXPORT void wgpuQueueSubmit(WGPUQueue queue, size_t commandCount, WGPUCommandBuffer const * commands) WGPU_FUNCTION_ATTRIBUTE; WGPU_EXPORT void wgpuQueueWriteBuffer(WGPUQueue queue, WGPUBuffer buffer, uint64_t bufferOffset, void const * data, size_t size) WGPU_FUNCTION_ATTRIBUTE; diff --git a/system/include/webgpu/webgpu_cpp.h b/system/include/webgpu/webgpu_cpp.h index c577c1276ccd0..57ca2dcca9f6b 100644 --- a/system/include/webgpu/webgpu_cpp.h +++ b/system/include/webgpu/webgpu_cpp.h @@ -995,7 +995,7 @@ namespace wgpu { using ObjectBase::ObjectBase; using ObjectBase::operator=; - void OnSubmittedWorkDone(uint64_t signalValue, QueueWorkDoneCallback callback, void * userdata) const; + void OnSubmittedWorkDone(QueueWorkDoneCallback callback, void * userdata) const; void SetLabel(char const * label) const; void Submit(size_t commandCount, CommandBuffer const * commands) const; void WriteBuffer(Buffer const& buffer, uint64_t bufferOffset, void const * data, size_t size) const; diff --git a/system/lib/webgpu/webgpu_cpp.cpp b/system/lib/webgpu/webgpu_cpp.cpp index 182a29f6da6c9..2a6d457ece616 100644 --- a/system/lib/webgpu/webgpu_cpp.cpp +++ b/system/lib/webgpu/webgpu_cpp.cpp @@ -2316,8 +2316,8 @@ template static_assert(sizeof(Queue) == sizeof(WGPUQueue), "sizeof mismatch for Queue"); static_assert(alignof(Queue) == alignof(WGPUQueue), "alignof mismatch for Queue"); - void Queue::OnSubmittedWorkDone(uint64_t signalValue, QueueWorkDoneCallback callback, void * userdata) const { - wgpuQueueOnSubmittedWorkDone(Get(), signalValue, callback, userdata); + void Queue::OnSubmittedWorkDone(QueueWorkDoneCallback callback, void * userdata) const { + wgpuQueueOnSubmittedWorkDone(Get(), callback, userdata); } void Queue::SetLabel(char const * label) const { wgpuQueueSetLabel(Get(), reinterpret_cast(label));