encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dawn/node: Don't abort if the GPUDevice is not destroyed 

Before being destructed.
If the Destroy() method is not called, then the lost_promise_ is not resolved or rejected, triggering an assertion.

Change-Id: I0a7c06674bc58d2e7c4df4229452bd2de27ca2b5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/95941
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Ben Clayton 2022-07-11 13:33:48 +00:00 committed by Dawn LUCI CQ
parent 1604ae5b97
commit 94c6495ad2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dawn/node/binding/GPUDevice.cpp
View File

@ -167,7 +167,15 @@ GPUDevice::GPUDevice(Napi::Env env, wgpu::Device device)
this); this);
} }
GPUDevice::~GPUDevice() {} GPUDevice::~GPUDevice() {
// A bit of a fudge to work around the fact that the CTS doesn't destroy GPU devices.
// Without this, we'll get a 'Promise not resolved or rejected' fatal message as the
// lost_promise_ is left hanging. We'll also not clean up any GPU objects before terminating the
// process, which is not a good idea.
if (device_) {
destroy(env_);
}
}
interop::Interface<interop::GPUSupportedFeatures> GPUDevice::getFeatures(Napi::Env env) { interop::Interface<interop::GPUSupportedFeatures> GPUDevice::getFeatures(Napi::Env env) {
class Features : public interop::GPUSupportedFeatures { class Features : public interop::GPUSupportedFeatures {
@ -196,6 +204,7 @@ void GPUDevice::destroy(Napi::Env env) {
env_, interop::GPUDeviceLostReason::kDestroyed, "device was destroyed")); env_, interop::GPUDeviceLostReason::kDestroyed, "device was destroyed"));
} }
device_.Destroy(); device_.Destroy();
device_ = nullptr;
} }
interop::Interface<interop::GPUBuffer> GPUDevice::createBuffer( interop::Interface<interop::GPUBuffer> GPUDevice::createBuffer(