Skip to content

Commit 6daa18b

Browse files
authored
WebGPU: Remove unused signalValue argument (#21299)
This was never implemented and was removed from Dawn and upstream webgpu.h a long time ago (and the JS API even longer ago). (This will be a tiny breaking change for a few apps but we're not stable and still need to do many more breaking changes.)
1 parent e96d976 commit 6daa18b

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

src/library_sigs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ sigs = {
16531653
wgpuQuerySetReference__sig: 'vp',
16541654
wgpuQuerySetRelease__sig: 'vp',
16551655
wgpuQuerySetSetLabel__sig: 'vpp',
1656-
wgpuQueueOnSubmittedWorkDone__sig: 'vpjpp',
1656+
wgpuQueueOnSubmittedWorkDone__sig: 'vppp',
16571657
wgpuQueueReference__sig: 'vp',
16581658
wgpuQueueRelease__sig: 'vp',
16591659
wgpuQueueSetLabel__sig: 'vpp',

src/library_webgpu.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,11 +1570,8 @@ var LibraryWebGPU = {
15701570
},
15711571

15721572
wgpuQueueOnSubmittedWorkDone__deps: ['$callUserCallback'],
1573-
wgpuQueueOnSubmittedWorkDone: (queueId, signalValue, callback, userdata) => {
1573+
wgpuQueueOnSubmittedWorkDone: (queueId, callback, userdata) => {
15741574
var queue = WebGPU.mgrQueue.get(queueId);
1575-
#if ASSERTIONS
1576-
assert(signalValue == 0, 'signalValue not supported, must be 0');
1577-
#endif
15781575

15791576
{{{ runtimeKeepalivePush() }}}
15801577
queue["onSubmittedWorkDone"]().then(() => {

system/include/webgpu/webgpu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ typedef void (*WGPUProcQuerySetReference)(WGPUQuerySet querySet) WGPU_FUNCTION_A
14591459
typedef void (*WGPUProcQuerySetRelease)(WGPUQuerySet querySet) WGPU_FUNCTION_ATTRIBUTE;
14601460

14611461
// Procs of Queue
1462-
typedef void (*WGPUProcQueueOnSubmittedWorkDone)(WGPUQueue queue, uint64_t signalValue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE;
1462+
typedef void (*WGPUProcQueueOnSubmittedWorkDone)(WGPUQueue queue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE;
14631463
typedef void (*WGPUProcQueueSetLabel)(WGPUQueue queue, char const * label) WGPU_FUNCTION_ATTRIBUTE;
14641464
typedef void (*WGPUProcQueueSubmit)(WGPUQueue queue, size_t commandCount, WGPUCommandBuffer const * commands) WGPU_FUNCTION_ATTRIBUTE;
14651465
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
16981698
WGPU_EXPORT void wgpuQuerySetRelease(WGPUQuerySet querySet) WGPU_FUNCTION_ATTRIBUTE;
16991699

17001700
// Methods of Queue
1701-
WGPU_EXPORT void wgpuQueueOnSubmittedWorkDone(WGPUQueue queue, uint64_t signalValue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE;
1701+
WGPU_EXPORT void wgpuQueueOnSubmittedWorkDone(WGPUQueue queue, WGPUQueueWorkDoneCallback callback, void * userdata) WGPU_FUNCTION_ATTRIBUTE;
17021702
WGPU_EXPORT void wgpuQueueSetLabel(WGPUQueue queue, char const * label) WGPU_FUNCTION_ATTRIBUTE;
17031703
WGPU_EXPORT void wgpuQueueSubmit(WGPUQueue queue, size_t commandCount, WGPUCommandBuffer const * commands) WGPU_FUNCTION_ATTRIBUTE;
17041704
WGPU_EXPORT void wgpuQueueWriteBuffer(WGPUQueue queue, WGPUBuffer buffer, uint64_t bufferOffset, void const * data, size_t size) WGPU_FUNCTION_ATTRIBUTE;

system/include/webgpu/webgpu_cpp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ namespace wgpu {
995995
using ObjectBase::ObjectBase;
996996
using ObjectBase::operator=;
997997

998-
void OnSubmittedWorkDone(uint64_t signalValue, QueueWorkDoneCallback callback, void * userdata) const;
998+
void OnSubmittedWorkDone(QueueWorkDoneCallback callback, void * userdata) const;
999999
void SetLabel(char const * label) const;
10001000
void Submit(size_t commandCount, CommandBuffer const * commands) const;
10011001
void WriteBuffer(Buffer const& buffer, uint64_t bufferOffset, void const * data, size_t size) const;

system/lib/webgpu/webgpu_cpp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,8 +2316,8 @@ template <typename T>
23162316
static_assert(sizeof(Queue) == sizeof(WGPUQueue), "sizeof mismatch for Queue");
23172317
static_assert(alignof(Queue) == alignof(WGPUQueue), "alignof mismatch for Queue");
23182318

2319-
void Queue::OnSubmittedWorkDone(uint64_t signalValue, QueueWorkDoneCallback callback, void * userdata) const {
2320-
wgpuQueueOnSubmittedWorkDone(Get(), signalValue, callback, userdata);
2319+
void Queue::OnSubmittedWorkDone(QueueWorkDoneCallback callback, void * userdata) const {
2320+
wgpuQueueOnSubmittedWorkDone(Get(), callback, userdata);
23212321
}
23222322
void Queue::SetLabel(char const * label) const {
23232323
wgpuQueueSetLabel(Get(), reinterpret_cast<char const * >(label));

0 commit comments

Comments
 (0)