Skip to content

GitLab

T
tangled
Commit c3a3aa7c authored by Austin Eng's avatar Austin Eng Committed by Chromium LUCI CQ
Browse files
Options

WebGPU: Only disconnect, don't destroy the client context on page teardown 

We cannot immediately destroy the context as JS code can still execute
after the iframe is removed. Instead we disconnect the context so that
new commands do nothing. Now, the context is not destroyed until all
WebGPU objects are GC'ed. A future change will improve this to tear down
the server GPU objects but keep the client context alive until GC.

Bug: 1160459
Change-Id: Iba58279a565d0099bf13420e1743003fc7c7aa23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613517
Auto-Submit: Austin Eng <enga@chromium.org>
Reviewed-by: default avatarKai Ninomiya <kainino@chromium.org>
Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845175}
parent fe0ad27c
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 93 deletions
content/test/data/gpu/webgpu-iframe-removed.html 0 → 100644
View file @ c3a3aa7c
<!--
Iframes can be tricky because even after they're removed from the page,
script can continue to run.
So, WebGPU cannot assume that WebGPU resources can be immediately
destroyed with the page.
This test tests a cases one after another by inserting an iframe into the page
with the test case script and waiting for the test to call
|removeIframe| which should remove itself from the DOM. After removal, we wait a bit
and then continue on to the next case.
-->
<html>
<head>
<script>
// |runTestCase| creates an iframe containing the stringified script source of |testFn|.
// It returns a Promise and saves the |resolve| function as |iframeRemovedCallback|.
// This callback is called in removeIframe, so when the Promise resolves, we know
// the iframe containing the test case page has been removed.
let iframeRemovedCallback;
function runTestCase(testFn) {
return new Promise(resolve => {
iframeRemovedCallback = resolve;
let iframe = document.createElement("iframe");
iframe.setAttribute("id", "iframe");
document.body.appendChild(iframe);
const head = iframe.contentWindow.document.getElementsByTagName('head')[0];
const script = iframe.contentWindow.document.createElement('script');
script.innerText = `(${testFn.toString()})().catch(parent.fail);`;
script.type = 'text/javascript';
head.appendChild(script);
});
}
// Called by the inner iframe to remove itself.
function removeIframe() {
const iframe = document.getElementById('iframe');
iframe.parentNode.removeChild(iframe);
// Wait a bit before signaling that the test case is finished.
setTimeout(iframeRemovedCallback, 100);
}
function fail(err) {
if (window.domAutomationController) {
console.log(err);
} else {
alert(err);
}
window.domAutomationController.send('FAILED');
}
async function runTests() {
// Test running basic WebGPU commands after the iframe is removed.
await runTestCase(async () => {
let device;
try {
const adapter = await navigator.gpu.requestAdapter();
device = await adapter.requestDevice();
} catch {
console.warn('WebGPU not supported');
parent.removeIframe();
return;
}
parent.removeIframe();
device.defaultQueue.submit([device.createCommandEncoder().finish()]);
});
// Test getting a swapchain texture after the iframe is removed.
// This may interact with the shared image interfaces.
await runTestCase(async () => {
const adapter = navigator.gpu && await navigator.gpu.requestAdapter();
if (!adapter) {
console.warn('WebGPU not supported');
parent.removeIframe();
return;
}
const device = await adapter.requestDevice();
const canvas = document.createElement('canvas');
const context = canvas.getContext('gpupresent');
const sc = context.configureSwapChain({
device,
format: 'bgra8unorm'
});
parent.removeIframe();
const texture = sc.getCurrentTexture();
});
// Test reconfiguring the swapchain after the iframe is removed.
// This may interact with the shared image interfaces.
// The expecation is that reconfiguring after removal does not crash, but
// does throw an exception. It is invalid to call |configureSwapChain| after
// the canvas is destroyed.
await runTestCase(async () => {
const adapter = navigator.gpu && await navigator.gpu.requestAdapter();
if (!adapter) {
console.warn('WebGPU not supported');
parent.removeIframe();
return;
}
const device = await adapter.requestDevice();
const canvas = document.createElement('canvas');
const context = canvas.getContext('gpupresent');
const sc = context.configureSwapChain({
device,
format: 'bgra8unorm'
});
const texture = sc.getCurrentTexture();
parent.removeIframe();
try {
/* Throws an exception since the canvas is destroyed */
context.configureSwapChain({
device,
format: 'bgra8unorm'
});
} catch (err) {
}
});
window.domAutomationController.send('FINISHED');
}
</script>
</head>
<body onload="runTests()"></body>
</html>
content/test/gpu/gpu_tests/gpu_process_integration_test.py
View file @ c3a3aa7c
...@@ -119,7 +119,9 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): ...@@ -119,7 +119,9 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
'gpu/functional_blank.html'), ('GpuProcess_swiftshader_for_webgl', 'gpu/functional_blank.html'), ('GpuProcess_swiftshader_for_webgl',
'gpu/functional_webgl.html'), 'gpu/functional_webgl.html'),
('GpuProcess_webgl_disabled_extension', ('GpuProcess_webgl_disabled_extension',
'gpu/functional_webgl_disabled_extension.html')) 'gpu/functional_webgl_disabled_extension.html'),
('GpuProcess_webgpu_iframe_removed',
'gpu/webgpu-iframe-removed.html'))
for t in tests: for t in tests:
yield (t[0], t[1], ('_' + t[0])) yield (t[0], t[1], ('_' + t[0]))
...@@ -587,6 +589,12 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): ...@@ -587,6 +589,12 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
'Backgrounded high-performance WebGL context did not release the ' 'Backgrounded high-performance WebGL context did not release the '
'hold on the high-performance GPU') 'hold on the high-performance GPU')
def _GpuProcess_webgpu_iframe_removed(self, test_path):
self.RestartBrowserIfNecessaryWithArgs([
'--enable-unsafe-webgpu',
])
self._NavigateAndWait(test_path)
@classmethod @classmethod
def ExpectationsFiles(cls): def ExpectationsFiles(cls):
return [ return [
......
gpu/command_buffer/client/webgpu_implementation.cc
View file @ c3a3aa7c
...@@ -615,6 +615,13 @@ void WebGPUImplementation::FlushAwaitingCommands( ...@@ -615,6 +615,13 @@ void WebGPUImplementation::FlushAwaitingCommands(
#endif #endif
} }
void WebGPUImplementation::DisconnectContextAndDestroyServer() {
// Treat this like a context lost since the context is no longer usable.
// TODO(crbug.com/1160459): Also send a message to eagerly free server-side
// resources.
OnGpuControlLostContextMaybeReentrant();
}
WGPUDevice WebGPUImplementation::GetDevice( WGPUDevice WebGPUImplementation::GetDevice(
DawnDeviceClientID device_client_id) { DawnDeviceClientID device_client_id) {
#if BUILDFLAG(USE_DAWN) #if BUILDFLAG(USE_DAWN)
......
gpu/command_buffer/client/webgpu_implementation.h
View file @ c3a3aa7c
...@@ -163,6 +163,7 @@ class WEBGPU_EXPORT WebGPUImplementation final : public WebGPUInterface, ...@@ -163,6 +163,7 @@ class WEBGPU_EXPORT WebGPUImplementation final : public WebGPUInterface,
void EnsureAwaitingFlush(DawnDeviceClientID device_client_id, void EnsureAwaitingFlush(DawnDeviceClientID device_client_id,
bool* needs_flush) override; bool* needs_flush) override;
void FlushAwaitingCommands(DawnDeviceClientID device_client_id) override; void FlushAwaitingCommands(DawnDeviceClientID device_client_id) override;
void DisconnectContextAndDestroyServer() override;
WGPUDevice GetDevice(DawnDeviceClientID device_client_id) override; WGPUDevice GetDevice(DawnDeviceClientID device_client_id) override;
ReservedTexture ReserveTexture(DawnDeviceClientID device_client_id) override; ReservedTexture ReserveTexture(DawnDeviceClientID device_client_id) override;
bool RequestAdapterAsync( bool RequestAdapterAsync(
......
gpu/command_buffer/client/webgpu_interface.h
View file @ c3a3aa7c
...@@ -46,6 +46,10 @@ class WebGPUInterface : public InterfaceBase { ...@@ -46,6 +46,10 @@ class WebGPUInterface : public InterfaceBase {
// nothing. // nothing.
virtual void FlushAwaitingCommands(DawnDeviceClientID device_client_id) = 0; virtual void FlushAwaitingCommands(DawnDeviceClientID device_client_id) = 0;
// Disconnect. All commands should become a no-op and server-side resources
// can be freed.
virtual void DisconnectContextAndDestroyServer() = 0;
virtual WGPUDevice GetDevice(DawnDeviceClientID device_client_id) = 0; virtual WGPUDevice GetDevice(DawnDeviceClientID device_client_id) = 0;
virtual ReservedTexture ReserveTexture( virtual ReservedTexture ReserveTexture(
DawnDeviceClientID device_client_id) = 0; DawnDeviceClientID device_client_id) = 0;
......
gpu/command_buffer/client/webgpu_interface_stub.cc
View file @ c3a3aa7c
...@@ -29,6 +29,7 @@ void WebGPUInterfaceStub::EnsureAwaitingFlush( ...@@ -29,6 +29,7 @@ void WebGPUInterfaceStub::EnsureAwaitingFlush(
bool* needs_flush) {} bool* needs_flush) {}
void WebGPUInterfaceStub::FlushAwaitingCommands( void WebGPUInterfaceStub::FlushAwaitingCommands(
DawnDeviceClientID device_client_id) {} DawnDeviceClientID device_client_id) {}
void WebGPUInterfaceStub::DisconnectContextAndDestroyServer() {}
WGPUDevice WebGPUInterfaceStub::GetDevice(DawnDeviceClientID device_client_id) { WGPUDevice WebGPUInterfaceStub::GetDevice(DawnDeviceClientID device_client_id) {
return nullptr; return nullptr;
} }
......
gpu/command_buffer/client/webgpu_interface_stub.h
View file @ c3a3aa7c
...@@ -29,6 +29,7 @@ class WebGPUInterfaceStub : public WebGPUInterface { ...@@ -29,6 +29,7 @@ class WebGPUInterfaceStub : public WebGPUInterface {
void EnsureAwaitingFlush(DawnDeviceClientID device_client_id, void EnsureAwaitingFlush(DawnDeviceClientID device_client_id,
bool* needs_flush) override; bool* needs_flush) override;
void FlushAwaitingCommands(DawnDeviceClientID device_client_id) override; void FlushAwaitingCommands(DawnDeviceClientID device_client_id) override;
void DisconnectContextAndDestroyServer() override;
WGPUDevice GetDevice(DawnDeviceClientID device_client_id) override; WGPUDevice GetDevice(DawnDeviceClientID device_client_id) override;
ReservedTexture ReserveTexture(DawnDeviceClientID device_client_id) override; ReservedTexture ReserveTexture(DawnDeviceClientID device_client_id) override;
bool RequestAdapterAsync( bool RequestAdapterAsync(
......
third_party/blink/renderer/modules/webgpu/dawn_object.cc
View file @ c3a3aa7c
...@@ -19,10 +19,6 @@ DawnObjectBase::GetDawnControlClient() const { ...@@ -19,10 +19,6 @@ DawnObjectBase::GetDawnControlClient() const {
return dawn_control_client_; return dawn_control_client_;
} }
bool DawnObjectBase::IsDawnControlClientDestroyed() const {
return dawn_control_client_->IsDestroyed();
}
gpu::webgpu::WebGPUInterface* DawnObjectBase::GetInterface() const { gpu::webgpu::WebGPUInterface* DawnObjectBase::GetInterface() const {
return dawn_control_client_->GetInterface(); return dawn_control_client_->GetInterface();
} }
...@@ -38,9 +34,6 @@ DawnDeviceClientSerializerHolder::DawnDeviceClientSerializerHolder( ...@@ -38,9 +34,6 @@ DawnDeviceClientSerializerHolder::DawnDeviceClientSerializerHolder(
device_client_id_(device_client_id) {} device_client_id_(device_client_id) {}
DawnDeviceClientSerializerHolder::~DawnDeviceClientSerializerHolder() { DawnDeviceClientSerializerHolder::~DawnDeviceClientSerializerHolder() {
if (dawn_control_client_->IsDestroyed()) {
return;
}
dawn_control_client_->GetInterface()->RemoveDevice(device_client_id_); dawn_control_client_->GetInterface()->RemoveDevice(device_client_id_);
} }
...@@ -49,9 +42,6 @@ DeviceTreeObject::GetDawnControlClient() const { ...@@ -49,9 +42,6 @@ DeviceTreeObject::GetDawnControlClient() const {
return device_client_serializer_holder_->dawn_control_client_; return device_client_serializer_holder_->dawn_control_client_;
} }
bool DeviceTreeObject::IsDawnControlClientDestroyed() const {
return GetDawnControlClient()->IsDestroyed();
}
gpu::webgpu::WebGPUInterface* DeviceTreeObject::GetInterface() const { gpu::webgpu::WebGPUInterface* DeviceTreeObject::GetInterface() const {
return GetDawnControlClient()->GetInterface(); return GetDawnControlClient()->GetInterface();
} }
...@@ -74,9 +64,6 @@ void DeviceTreeObject::EnsureFlush() { ...@@ -74,9 +64,6 @@ void DeviceTreeObject::EnsureFlush() {
} }
Microtask::EnqueueMicrotask(WTF::Bind( Microtask::EnqueueMicrotask(WTF::Bind(
[](scoped_refptr<DawnDeviceClientSerializerHolder> holder) { [](scoped_refptr<DawnDeviceClientSerializerHolder> holder) {
if (holder->dawn_control_client_->IsDestroyed()) {
return;
}
holder->dawn_control_client_->GetInterface()->FlushAwaitingCommands( holder->dawn_control_client_->GetInterface()->FlushAwaitingCommands(
holder->device_client_id_); holder->device_client_id_);
}, },
......
third_party/blink/renderer/modules/webgpu/dawn_object.h
View file @ c3a3aa7c
...@@ -35,7 +35,6 @@ class DawnObjectBase { ...@@ -35,7 +35,6 @@ class DawnObjectBase {
scoped_refptr<DawnControlClientHolder> dawn_control_client); scoped_refptr<DawnControlClientHolder> dawn_control_client);
const scoped_refptr<DawnControlClientHolder>& GetDawnControlClient() const; const scoped_refptr<DawnControlClientHolder>& GetDawnControlClient() const;
bool IsDawnControlClientDestroyed() const;
gpu::webgpu::WebGPUInterface* GetInterface() const; gpu::webgpu::WebGPUInterface* GetInterface() const;
const DawnProcTable& GetProcs() const; const DawnProcTable& GetProcs() const;
...@@ -82,7 +81,6 @@ class DeviceTreeObject { ...@@ -82,7 +81,6 @@ class DeviceTreeObject {
std::move(device_client_seralizer_holder)) {} std::move(device_client_seralizer_holder)) {}
const scoped_refptr<DawnControlClientHolder>& GetDawnControlClient() const; const scoped_refptr<DawnControlClientHolder>& GetDawnControlClient() const;
bool IsDawnControlClientDestroyed() const;
gpu::webgpu::WebGPUInterface* GetInterface() const; gpu::webgpu::WebGPUInterface* GetInterface() const;
const DawnProcTable& GetProcs() const; const DawnProcTable& GetProcs() const;
......
third_party/blink/renderer/modules/webgpu/gpu_bind_group.cc
View file @ c3a3aa7c
...@@ -78,9 +78,6 @@ GPUBindGroup::GPUBindGroup(GPUDevice* device, WGPUBindGroup bind_group) ...@@ -78,9 +78,6 @@ GPUBindGroup::GPUBindGroup(GPUDevice* device, WGPUBindGroup bind_group)
: DawnObject<WGPUBindGroup>(device, bind_group) {} : DawnObject<WGPUBindGroup>(device, bind_group) {}
GPUBindGroup::~GPUBindGroup() { GPUBindGroup::~GPUBindGroup() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().bindGroupRelease(GetHandle()); GetProcs().bindGroupRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.cc
View file @ c3a3aa7c
...@@ -135,9 +135,6 @@ GPUBindGroupLayout::GPUBindGroupLayout(GPUDevice* device, ...@@ -135,9 +135,6 @@ GPUBindGroupLayout::GPUBindGroupLayout(GPUDevice* device,
: DawnObject<WGPUBindGroupLayout>(device, bind_group_layout) {} : DawnObject<WGPUBindGroupLayout>(device, bind_group_layout) {}
GPUBindGroupLayout::~GPUBindGroupLayout() { GPUBindGroupLayout::~GPUBindGroupLayout() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().bindGroupLayoutRelease(GetHandle()); GetProcs().bindGroupLayoutRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_buffer.cc
View file @ c3a3aa7c
...@@ -80,9 +80,6 @@ GPUBuffer::GPUBuffer(GPUDevice* device, ...@@ -80,9 +80,6 @@ GPUBuffer::GPUBuffer(GPUDevice* device,
} }
GPUBuffer::~GPUBuffer() { GPUBuffer::~GPUBuffer() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().bufferRelease(GetHandle()); GetProcs().bufferRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_command_buffer.cc
View file @ c3a3aa7c
...@@ -13,9 +13,6 @@ GPUCommandBuffer::GPUCommandBuffer(GPUDevice* device, ...@@ -13,9 +13,6 @@ GPUCommandBuffer::GPUCommandBuffer(GPUDevice* device,
: DawnObject<WGPUCommandBuffer>(device, command_buffer) {} : DawnObject<WGPUCommandBuffer>(device, command_buffer) {}
GPUCommandBuffer::~GPUCommandBuffer() { GPUCommandBuffer::~GPUCommandBuffer() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().commandBufferRelease(GetHandle()); GetProcs().commandBufferRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_command_encoder.cc
View file @ c3a3aa7c
...@@ -166,9 +166,6 @@ GPUCommandEncoder::GPUCommandEncoder(GPUDevice* device, ...@@ -166,9 +166,6 @@ GPUCommandEncoder::GPUCommandEncoder(GPUDevice* device,
: DawnObject<WGPUCommandEncoder>(device, command_encoder) {} : DawnObject<WGPUCommandEncoder>(device, command_encoder) {}
GPUCommandEncoder::~GPUCommandEncoder() { GPUCommandEncoder::~GPUCommandEncoder() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().commandEncoderRelease(GetHandle()); GetProcs().commandEncoderRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_compute_pass_encoder.cc
View file @ c3a3aa7c
...@@ -18,9 +18,6 @@ GPUComputePassEncoder::GPUComputePassEncoder( ...@@ -18,9 +18,6 @@ GPUComputePassEncoder::GPUComputePassEncoder(
: DawnObject<WGPUComputePassEncoder>(device, compute_pass_encoder) {} : DawnObject<WGPUComputePassEncoder>(device, compute_pass_encoder) {}
GPUComputePassEncoder::~GPUComputePassEncoder() { GPUComputePassEncoder::~GPUComputePassEncoder() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().computePassEncoderRelease(GetHandle()); GetProcs().computePassEncoderRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_compute_pipeline.cc
View file @ c3a3aa7c
...@@ -59,9 +59,6 @@ GPUComputePipeline::GPUComputePipeline(GPUDevice* device, ...@@ -59,9 +59,6 @@ GPUComputePipeline::GPUComputePipeline(GPUDevice* device,
: DawnObject<WGPUComputePipeline>(device, compute_pipeline) {} : DawnObject<WGPUComputePipeline>(device, compute_pipeline) {}
GPUComputePipeline::~GPUComputePipeline() { GPUComputePipeline::~GPUComputePipeline() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().computePipelineRelease(GetHandle()); GetProcs().computePipelineRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_device.cc
View file @ c3a3aa7c
...@@ -85,9 +85,6 @@ GPUDevice::GPUDevice(ExecutionContext* execution_context, ...@@ -85,9 +85,6 @@ GPUDevice::GPUDevice(ExecutionContext* execution_context,
} }
GPUDevice::~GPUDevice() { GPUDevice::~GPUDevice() {
if (IsDawnControlClientDestroyed()) {
return;
}
queue_ = nullptr; queue_ = nullptr;
GetProcs().deviceRelease(GetHandle()); GetProcs().deviceRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_fence.cc
View file @ c3a3aa7c
...@@ -18,9 +18,6 @@ GPUFence::GPUFence(GPUDevice* device, WGPUFence fence) ...@@ -18,9 +18,6 @@ GPUFence::GPUFence(GPUDevice* device, WGPUFence fence)
: DawnObject<WGPUFence>(device, fence) {} : DawnObject<WGPUFence>(device, fence) {}
GPUFence::~GPUFence() { GPUFence::~GPUFence() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().fenceRelease(GetHandle()); GetProcs().fenceRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_pipeline_layout.cc
View file @ c3a3aa7c
...@@ -45,9 +45,6 @@ GPUPipelineLayout::GPUPipelineLayout(GPUDevice* device, ...@@ -45,9 +45,6 @@ GPUPipelineLayout::GPUPipelineLayout(GPUDevice* device,
: DawnObject<WGPUPipelineLayout>(device, pipeline_layout) {} : DawnObject<WGPUPipelineLayout>(device, pipeline_layout) {}
GPUPipelineLayout::~GPUPipelineLayout() { GPUPipelineLayout::~GPUPipelineLayout() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().pipelineLayoutRelease(GetHandle()); GetProcs().pipelineLayoutRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_query_set.cc
View file @ c3a3aa7c
...@@ -46,9 +46,6 @@ GPUQuerySet::GPUQuerySet(GPUDevice* device, WGPUQuerySet querySet) ...@@ -46,9 +46,6 @@ GPUQuerySet::GPUQuerySet(GPUDevice* device, WGPUQuerySet querySet)
: DawnObject<WGPUQuerySet>(device, querySet) {} : DawnObject<WGPUQuerySet>(device, querySet) {}
GPUQuerySet::~GPUQuerySet() { GPUQuerySet::~GPUQuerySet() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().querySetRelease(GetHandle()); GetProcs().querySetRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_queue.cc
View file @ c3a3aa7c
...@@ -134,10 +134,6 @@ GPUQueue::GPUQueue(GPUDevice* device, WGPUQueue queue) ...@@ -134,10 +134,6 @@ GPUQueue::GPUQueue(GPUDevice* device, WGPUQueue queue)
GPUQueue::~GPUQueue() { GPUQueue::~GPUQueue() {
produce_dawn_texture_handler_ = nullptr; produce_dawn_texture_handler_ = nullptr;
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().queueRelease(GetHandle()); GetProcs().queueRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_render_bundle.cc
View file @ c3a3aa7c
...@@ -13,9 +13,6 @@ GPURenderBundle::GPURenderBundle(GPUDevice* device, ...@@ -13,9 +13,6 @@ GPURenderBundle::GPURenderBundle(GPUDevice* device,
: DawnObject<WGPURenderBundle>(device, render_bundle) {} : DawnObject<WGPURenderBundle>(device, render_bundle) {}
GPURenderBundle::~GPURenderBundle() { GPURenderBundle::~GPURenderBundle() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().renderBundleRelease(GetHandle()); GetProcs().renderBundleRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_render_bundle_encoder.cc
View file @ c3a3aa7c
...@@ -55,9 +55,6 @@ GPURenderBundleEncoder::GPURenderBundleEncoder( ...@@ -55,9 +55,6 @@ GPURenderBundleEncoder::GPURenderBundleEncoder(
: DawnObject<WGPURenderBundleEncoder>(device, render_bundle_encoder) {} : DawnObject<WGPURenderBundleEncoder>(device, render_bundle_encoder) {}
GPURenderBundleEncoder::~GPURenderBundleEncoder() { GPURenderBundleEncoder::~GPURenderBundleEncoder() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().renderBundleEncoderRelease(GetHandle()); GetProcs().renderBundleEncoderRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_render_pass_encoder.cc
View file @ c3a3aa7c
...@@ -23,9 +23,6 @@ GPURenderPassEncoder::GPURenderPassEncoder( ...@@ -23,9 +23,6 @@ GPURenderPassEncoder::GPURenderPassEncoder(
: DawnObject<WGPURenderPassEncoder>(device, render_pass_encoder) {} : DawnObject<WGPURenderPassEncoder>(device, render_pass_encoder) {}
GPURenderPassEncoder::~GPURenderPassEncoder() { GPURenderPassEncoder::~GPURenderPassEncoder() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().renderPassEncoderRelease(GetHandle()); GetProcs().renderPassEncoderRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.cc
View file @ c3a3aa7c
...@@ -291,9 +291,6 @@ GPURenderPipeline::GPURenderPipeline(GPUDevice* device, ...@@ -291,9 +291,6 @@ GPURenderPipeline::GPURenderPipeline(GPUDevice* device,
: DawnObject<WGPURenderPipeline>(device, render_pipeline) {} : DawnObject<WGPURenderPipeline>(device, render_pipeline) {}
GPURenderPipeline::~GPURenderPipeline() { GPURenderPipeline::~GPURenderPipeline() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().renderPipelineRelease(GetHandle()); GetProcs().renderPipelineRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_sampler.cc
View file @ c3a3aa7c
...@@ -61,9 +61,6 @@ GPUSampler::GPUSampler(GPUDevice* device, WGPUSampler sampler) ...@@ -61,9 +61,6 @@ GPUSampler::GPUSampler(GPUDevice* device, WGPUSampler sampler)
: DawnObject<WGPUSampler>(device, sampler) {} : DawnObject<WGPUSampler>(device, sampler) {}
GPUSampler::~GPUSampler() { GPUSampler::~GPUSampler() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().samplerRelease(GetHandle()); GetProcs().samplerRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_shader_module.cc
View file @ c3a3aa7c
...@@ -65,9 +65,6 @@ GPUShaderModule::GPUShaderModule(GPUDevice* device, ...@@ -65,9 +65,6 @@ GPUShaderModule::GPUShaderModule(GPUDevice* device,
: DawnObject<WGPUShaderModule>(device, shader_module) {} : DawnObject<WGPUShaderModule>(device, shader_module) {}
GPUShaderModule::~GPUShaderModule() { GPUShaderModule::~GPUShaderModule() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().shaderModuleRelease(GetHandle()); GetProcs().shaderModuleRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_texture.cc
View file @ c3a3aa7c
...@@ -96,9 +96,6 @@ GPUTexture::GPUTexture(GPUDevice* device, ...@@ -96,9 +96,6 @@ GPUTexture::GPUTexture(GPUDevice* device,
: DawnObject<WGPUTexture>(device, texture), format_(format) {} : DawnObject<WGPUTexture>(device, texture), format_(format) {}
GPUTexture::~GPUTexture() { GPUTexture::~GPUTexture() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().textureRelease(GetHandle()); GetProcs().textureRelease(GetHandle());
} }
......
third_party/blink/renderer/modules/webgpu/gpu_texture_view.cc
View file @ c3a3aa7c
...@@ -12,9 +12,6 @@ GPUTextureView::GPUTextureView(GPUDevice* device, WGPUTextureView texture_view) ...@@ -12,9 +12,6 @@ GPUTextureView::GPUTextureView(GPUDevice* device, WGPUTextureView texture_view)
: DawnObject<WGPUTextureView>(device, texture_view) {} : DawnObject<WGPUTextureView>(device, texture_view) {}
GPUTextureView::~GPUTextureView() { GPUTextureView::~GPUTextureView() {
if (IsDawnControlClientDestroyed()) {
return;
}
GetProcs().textureViewRelease(GetHandle()); GetProcs().textureViewRelease(GetHandle());
} }
......
third_party/blink/renderer/platform/graphics/gpu/dawn_control_client_holder.cc
View file @ c3a3aa7c
...@@ -21,12 +21,8 @@ void DawnControlClientHolder::SetLostContextCallback() { ...@@ -21,12 +21,8 @@ void DawnControlClientHolder::SetLostContextCallback() {
} }
void DawnControlClientHolder::Destroy() { void DawnControlClientHolder::Destroy() {
interface_ = nullptr; SetContextLost();
context_provider_.reset(); interface_->DisconnectContextAndDestroyServer();
}
bool DawnControlClientHolder::IsDestroyed() const {
return !interface_;
} }
WebGraphicsContext3DProvider* DawnControlClientHolder::GetContextProvider() WebGraphicsContext3DProvider* DawnControlClientHolder::GetContextProvider()
......
third_party/blink/renderer/platform/graphics/gpu/dawn_control_client_holder.h
View file @ c3a3aa7c
...@@ -32,7 +32,6 @@ class PLATFORM_EXPORT DawnControlClientHolder ...@@ -32,7 +32,6 @@ class PLATFORM_EXPORT DawnControlClientHolder
std::unique_ptr<WebGraphicsContext3DProvider> context_provider); std::unique_ptr<WebGraphicsContext3DProvider> context_provider);
void Destroy(); void Destroy();
bool IsDestroyed() const;
WebGraphicsContext3DProvider* GetContextProvider() const; WebGraphicsContext3DProvider* GetContextProvider() const;
gpu::webgpu::WebGPUInterface* GetInterface() const; gpu::webgpu::WebGPUInterface* GetInterface() const;
......
third_party/blink/renderer/platform/graphics/gpu/webgpu_image_bitmap_handler.cc
View file @ c3a3aa7c
...@@ -151,8 +151,6 @@ DawnTextureFromImageBitmap::~DawnTextureFromImageBitmap() { ...@@ -151,8 +151,6 @@ DawnTextureFromImageBitmap::~DawnTextureFromImageBitmap() {
WGPUTexture DawnTextureFromImageBitmap::ProduceDawnTextureFromImageBitmap( WGPUTexture DawnTextureFromImageBitmap::ProduceDawnTextureFromImageBitmap(
scoped_refptr<StaticBitmapImage> image) { scoped_refptr<StaticBitmapImage> image) {
DCHECK(!dawn_control_client_->IsDestroyed());
associated_resource_ = image->GetMailboxHolder().mailbox; associated_resource_ = image->GetMailboxHolder().mailbox;
// Produce and inject image to WebGPU texture // Produce and inject image to WebGPU texture
...@@ -174,7 +172,6 @@ WGPUTexture DawnTextureFromImageBitmap::ProduceDawnTextureFromImageBitmap( ...@@ -174,7 +172,6 @@ WGPUTexture DawnTextureFromImageBitmap::ProduceDawnTextureFromImageBitmap(
} }
void DawnTextureFromImageBitmap::FinishDawnTextureFromImageBitmapAccess() { void DawnTextureFromImageBitmap::FinishDawnTextureFromImageBitmapAccess() {
DCHECK(!dawn_control_client_->IsDestroyed());
DCHECK_NE(wire_texture_id_, 0u); DCHECK_NE(wire_texture_id_, 0u);
gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface(); gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface();
......
third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc
View file @ c3a3aa7c
...@@ -78,7 +78,7 @@ void WebGPUSwapBufferProvider::Neuter() { ...@@ -78,7 +78,7 @@ void WebGPUSwapBufferProvider::Neuter() {
layer_ = nullptr; layer_ = nullptr;
} }
if (current_swap_buffer_ && !dawn_control_client_->IsDestroyed()) { if (current_swap_buffer_) {
// Ensure we wait for previous WebGPU commands before destroying the shared // Ensure we wait for previous WebGPU commands before destroying the shared
// image. // image.
gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface(); gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface();
...@@ -92,7 +92,7 @@ void WebGPUSwapBufferProvider::Neuter() { ...@@ -92,7 +92,7 @@ void WebGPUSwapBufferProvider::Neuter() {
} }
WGPUTexture WebGPUSwapBufferProvider::GetNewTexture(const IntSize& size) { WGPUTexture WebGPUSwapBufferProvider::GetNewTexture(const IntSize& size) {
DCHECK(!current_swap_buffer_ && !dawn_control_client_->IsDestroyed()); DCHECK(!current_swap_buffer_);
gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface(); gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface();
gpu::SharedImageInterface* sii = gpu::SharedImageInterface* sii =
...@@ -138,7 +138,7 @@ bool WebGPUSwapBufferProvider::PrepareTransferableResource( ...@@ -138,7 +138,7 @@ bool WebGPUSwapBufferProvider::PrepareTransferableResource(
cc::SharedBitmapIdRegistrar* bitmap_registrar, cc::SharedBitmapIdRegistrar* bitmap_registrar,
viz::TransferableResource* out_resource, viz::TransferableResource* out_resource,
std::unique_ptr<viz::SingleReleaseCallback>* out_release_callback) { std::unique_ptr<viz::SingleReleaseCallback>* out_release_callback) {
DCHECK(!neutered_ && !dawn_control_client_->IsDestroyed()); DCHECK(!neutered_);
if (!current_swap_buffer_ || neutered_) { if (!current_swap_buffer_ || neutered_) {
return false; return false;
...@@ -213,9 +213,6 @@ WebGPUSwapBufferProvider::SwapBuffer::SwapBuffer( ...@@ -213,9 +213,6 @@ WebGPUSwapBufferProvider::SwapBuffer::SwapBuffer(
access_finished_token(creation_token) {} access_finished_token(creation_token) {}
WebGPUSwapBufferProvider::SwapBuffer::~SwapBuffer() { WebGPUSwapBufferProvider::SwapBuffer::~SwapBuffer() {
if (swap_buffers->dawn_control_client_->IsDestroyed()) {
return;
}
gpu::SharedImageInterface* sii = gpu::SharedImageInterface* sii =
swap_buffers->dawn_control_client_->GetContextProvider() swap_buffers->dawn_control_client_->GetContextProvider()
->SharedImageInterface(); ->SharedImageInterface();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment