From 52dd651aeda9a595b2b5b0b327d8312894cbe5c6 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Mon, 3 Mar 2025 22:15:14 +0100 Subject: [PATCH] wgpu: device lost callback device by pointer in JS --- vendor/wgpu/wgpu.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vendor/wgpu/wgpu.js b/vendor/wgpu/wgpu.js index 4816659f9..055f7abab 100644 --- a/vendor/wgpu/wgpu.js +++ b/vendor/wgpu/wgpu.js @@ -1217,17 +1217,22 @@ class WebGPUInterface { .then((device) => { const deviceIdx = this.devices.create(device); - const deviceLostCallbackInfo = off(this.sizes.CallbackInfo); - if (descriptorPtr !== 0 && deviceLostCallbackInfo !== null) { + if (deviceLostCallbackInfo.callback !== null) { device.lost.then((info) => { const reason = ENUMS.DeviceLostReason.indexOf(info.reason); + + const devicePtr = this.mem.exports.wgpu_alloc(4); + this.mem.storeI32(devicePtr, deviceIdx); + const messageAddr = this.makeMessageArg(info.message); - this.callCallback(deviceLostCallbackInfo, [deviceIdx, reason, messageAddr]); + this.callCallback(deviceLostCallbackInfo, [devicePtr, reason, messageAddr]); + + this.mem.exports.wgpu_free(devicePtr); this.mem.exports.wgpu_free(messageAddr); }); } - if (descriptorPtr !== 0 && uncapturedErrorCallbackInfo !== null) { + if (uncapturedErrorCallbackInfo.callback !== null) { device.onuncapturederror = (ev) => { let status; if (ev.error instanceof GPUValidationError) {