corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1940671 - Fix command buffer id leak. r=webgpu-reviewers,ErichDonGubler

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D234023
This commit is contained in:
Nicolas Silva
2025-01-14 08:08:00 +00:00
parent 12b6be8aa3
commit 376f6268f9
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dom/webgpu/ipc/WebGPUChild.cpp
View File

@@ -223,8 +223,11 @@ void WebGPUChild::SwapChainPresent(RawId aTextureId,
const RemoteTextureOwnerId& aOwnerId) { const RemoteTextureOwnerId& aOwnerId) {
// Hack: the function expects `DeviceId`, but it only uses it for `backend()` // Hack: the function expects `DeviceId`, but it only uses it for `backend()`
// selection. // selection.
// The parent side needs to create a command encoder which will be submitted
// and dropped right away so we create and release an encoder ID here.
RawId encoderId = ffi::wgpu_client_make_encoder_id(mClient.get()); RawId encoderId = ffi::wgpu_client_make_encoder_id(mClient.get());
SendSwapChainPresent(aTextureId, encoderId, aRemoteTextureId, aOwnerId); SendSwapChainPresent(aTextureId, encoderId, aRemoteTextureId, aOwnerId);
ffi::wgpu_client_free_command_encoder_id(mClient.get(), encoderId);
} }
void WebGPUChild::RegisterDevice(Device* const aDevice) { void WebGPUChild::RegisterDevice(Device* const aDevice) {

2
dom/webgpu/ipc/WebGPUParent.cpp
View File

@@ -1319,6 +1319,7 @@ ipc::IPCResult WebGPUParent::RecvSwapChainPresent(
ffi::wgpu_server_encoder_finish(mContext.get(), aCommandEncoderId, ffi::wgpu_server_encoder_finish(mContext.get(), aCommandEncoderId,
&commandDesc, error.ToFFI()); &commandDesc, error.ToFFI());
if (ForwardError(data->mDeviceId, error)) { if (ForwardError(data->mDeviceId, error)) {
ffi::wgpu_server_encoder_drop(mContext.get(), aCommandEncoderId);
return IPC_OK(); return IPC_OK();
} }
} }
@@ -1327,6 +1328,7 @@ ipc::IPCResult WebGPUParent::RecvSwapChainPresent(
ErrorBuffer error; ErrorBuffer error;
ffi::wgpu_server_queue_submit(mContext.get(), data->mQueueId, ffi::wgpu_server_queue_submit(mContext.get(), data->mQueueId,
&aCommandEncoderId, 1, error.ToFFI()); &aCommandEncoderId, 1, error.ToFFI());
ffi::wgpu_server_encoder_drop(mContext.get(), aCommandEncoderId);
if (ForwardError(data->mDeviceId, error)) { if (ForwardError(data->mDeviceId, error)) {
return IPC_OK(); return IPC_OK();
} }