From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/webgpu/BindGroup.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'dom/webgpu/BindGroup.cpp')

diff --git a/dom/webgpu/BindGroup.cpp b/dom/webgpu/BindGroup.cpp
index 7ae5b8c3bb..b3cd3d9d5e 100644
--- a/dom/webgpu/BindGroup.cpp
+++ b/dom/webgpu/BindGroup.cpp
@@ -22,13 +22,21 @@ BindGroup::BindGroup(Device* const aParent, RawId aId)
 BindGroup::~BindGroup() { Cleanup(); }
 
 void BindGroup::Cleanup() {
-  if (mValid && mParent) {
-    mValid = false;
-    auto bridge = mParent->GetBridge();
-    if (bridge && bridge->IsOpen()) {
-      bridge->SendBindGroupDrop(mId);
-    }
+  if (!mValid) {
+    return;
   }
+  mValid = false;
+
+  auto bridge = mParent->GetBridge();
+  if (!bridge) {
+    return;
+  }
+
+  if (bridge->CanSend()) {
+    bridge->SendBindGroupDrop(mId);
+  }
+
+  wgpu_client_free_bind_group_id(bridge->GetClient(), mId);
 }
 
 }  // namespace mozilla::webgpu
-- 
cgit v1.2.3