1 files changed, 33 insertions, 39 deletions

diff --git a/components/script/dom/identityhub.rs b/components/script/dom/identityhub.rs
index 91ead1acf0a..311428893c0 100644
--- a/components/script/dom/identityhub.rs
+++ b/components/script/dom/identityhub.rs
@@ -5,7 +5,7 @@
 use smallvec::SmallVec;
 use webgpu::wgpu::{
     hub::IdentityManager,
-    id::{AdapterId, BindGroupLayoutId, BufferId, DeviceId, PipelineLayoutId},
+    id::{AdapterId, BindGroupId, BindGroupLayoutId, BufferId, DeviceId, PipelineLayoutId},
     Backend,
 };
 
@@ -14,6 +14,7 @@ pub struct IdentityHub {
     adapters: IdentityManager,
     devices: IdentityManager,
     buffers: IdentityManager,
+    bind_groups: IdentityManager,
     bind_group_layouts: IdentityManager,
     pipeline_layouts: IdentityManager,
     backend: Backend,
@@ -25,6 +26,7 @@ impl IdentityHub {
             adapters: IdentityManager::default(),
             devices: IdentityManager::default(),
             buffers: IdentityManager::default(),
+            bind_groups: IdentityManager::default(),
             bind_group_layouts: IdentityManager::default(),
             pipeline_layouts: IdentityManager::default(),
             backend,
@@ -43,6 +45,10 @@ impl IdentityHub {
         self.buffers.alloc(self.backend)
     }
 
+    fn create_bind_group_id(&mut self) -> BindGroupId {
+        self.bind_groups.alloc(self.backend)
+    }
+
     fn create_bind_group_layout_id(&mut self) -> BindGroupLayoutId {
         self.bind_group_layouts.alloc(self.backend)
     }
@@ -82,6 +88,20 @@ impl Identities {
         }
     }
 
+    fn select(&mut self, backend: Backend) -> &mut IdentityHub {
+        match backend {
+            #[cfg(any(target_os = "linux", target_os = "windows"))]
+            Backend::Vulkan => &mut self.vk_hub,
+            #[cfg(target_os = "windows")]
+            Backend::Dx12 => &mut self.dx12_hub,
+            #[cfg(target_os = "windows")]
+            Backend::Dx11 => &mut self.dx11_hub,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            Backend::Metal => &mut self.metal_hub,
+            _ => &mut self.dummy_hub,
+        }
+    }
+
     fn hubs(&mut self) -> Vec<&mut IdentityHub> {
         vec![
             #[cfg(any(target_os = "linux", target_os = "windows"))]
@@ -97,17 +117,7 @@ impl Identities {
     }
 
     pub fn create_device_id(&mut self, backend: Backend) -> DeviceId {
-        match backend {
-            #[cfg(any(target_os = "linux", target_os = "windows"))]
-            Backend::Vulkan => self.vk_hub.create_device_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx12 => self.dx12_hub.create_device_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx11 => self.dx11_hub.create_device_id(),
-            #[cfg(any(target_os = "ios", target_os = "macos"))]
-            Backend::Metal => self.metal_hub.create_device_id(),
-            _ => self.dummy_hub.create_device_id(),
-        }
+        self.select(backend).create_device_id()
     }
 
     pub fn create_adapter_ids(&mut self) -> SmallVec<[AdapterId; 4]> {
@@ -119,44 +129,28 @@ impl Identities {
     }
 
     pub fn create_buffer_id(&mut self, backend: Backend) -> BufferId {
+        self.select(backend).create_buffer_id()
+    }
+
+    pub fn create_bind_group_id(&mut self, backend: Backend) -> BindGroupId {
         match backend {
             #[cfg(any(target_os = "linux", target_os = "windows"))]
-            Backend::Vulkan => self.vk_hub.create_buffer_id(),
+            Backend::Vulkan => self.vk_hub.create_bind_group_id(),
             #[cfg(target_os = "windows")]
-            Backend::Dx12 => self.dx12_hub.create_buffer_id(),
+            Backend::Dx12 => self.dx12_hub.create_bind_group_id(),
             #[cfg(target_os = "windows")]
-            Backend::Dx11 => self.dx11_hub.create_buffer_id(),
+            Backend::Dx11 => self.dx11_hub.create_bind_group_id(),
             #[cfg(any(target_os = "ios", target_os = "macos"))]
-            Backend::Metal => self.metal_hub.create_buffer_id(),
-            _ => self.dummy_hub.create_buffer_id(),
+            Backend::Metal => self.metal_hub.create_bind_group_id(),
+            _ => self.dummy_hub.create_bind_group_id(),
         }
     }
 
     pub fn create_bind_group_layout_id(&mut self, backend: Backend) -> BindGroupLayoutId {
-        match backend {
-            #[cfg(any(target_os = "linux", target_os = "windows"))]
-            Backend::Vulkan => self.vk_hub.create_bind_group_layout_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx12 => self.dx12_hub.create_bind_group_layout_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx11 => self.dx11_hub.create_bind_group_layout_id(),
-            #[cfg(any(target_os = "ios", target_os = "macos"))]
-            Backend::Metal => self.metal_hub.create_bind_group_layout_id(),
-            _ => self.dummy_hub.create_bind_group_layout_id(),
-        }
+        self.select(backend).create_bind_group_layout_id()
     }
 
     pub fn create_pipeline_layout_id(&mut self, backend: Backend) -> PipelineLayoutId {
-        match backend {
-            #[cfg(any(target_os = "linux", target_os = "windows"))]
-            Backend::Vulkan => self.vk_hub.create_pipeline_layout_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx12 => self.dx12_hub.create_pipeline_layout_id(),
-            #[cfg(target_os = "windows")]
-            Backend::Dx11 => self.dx11_hub.create_pipeline_layout_id(),
-            #[cfg(any(target_os = "ios", target_os = "macos"))]
-            Backend::Metal => self.metal_hub.create_pipeline_layout_id(),
-            _ => self.dummy_hub.create_pipeline_layout_id(),
-        }
+        self.select(backend).create_pipeline_layout_id()
     }
 }