From de97e5449c1114dc664fe4fd420deb944ab48161 Mon Sep 17 00:00:00 2001 From: teoxoy <28601907+teoxoy@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:49:08 +0200 Subject: [PATCH] move `enumerate_adapters` on the `Instance` --- wgpu-core/src/instance.rs | 46 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs index bd8e2dc7e..e36cd3926 100644 --- a/wgpu-core/src/instance.rs +++ b/wgpu-core/src/instance.rs @@ -135,6 +135,28 @@ impl Instance { }) } + pub fn enumerate_adapters(&self, backends: Backends) -> Vec { + profiling::scope!("Instance::enumerate_adapters"); + api_log!("Instance::enumerate_adapters"); + + let mut adapters = Vec::new(); + for (_, instance) in self + .instance_per_backend + .iter() + .filter(|(backend, _)| backends.contains(Backends::from(*backend))) + { + profiling::scope!("enumerating", &*format!("{:?}", backend)); + + let hal_adapters = unsafe { instance.enumerate_adapters(None) }; + for raw in hal_adapters { + let adapter = Adapter::new(raw); + log::info!("Adapter {:?}", adapter.raw.info); + adapters.push(adapter); + } + } + adapters + } + pub fn request_adapter( &self, desc: &wgt::RequestAdapterOptions<&Surface>, @@ -687,27 +709,11 @@ impl Global { } pub fn enumerate_adapters(&self, backends: Backends) -> Vec { - profiling::scope!("Instance::enumerate_adapters"); - api_log!("Instance::enumerate_adapters"); - - let mut adapters = Vec::new(); - for (_, instance) in self - .instance - .instance_per_backend - .iter() - .filter(|(backend, _)| backends.contains(Backends::from(*backend))) - { - profiling::scope!("enumerating", &*format!("{:?}", backend)); - - let hal_adapters = unsafe { instance.enumerate_adapters(None) }; - for raw in hal_adapters { - let adapter = Adapter::new(raw); - log::info!("Adapter {:?}", adapter.raw.info); - let id = self.hub.adapters.prepare(None).assign(Arc::new(adapter)); - adapters.push(id); - } - } + let adapters = self.instance.enumerate_adapters(backends); adapters + .into_iter() + .map(|adapter| self.hub.adapters.prepare(None).assign(Arc::new(adapter))) + .collect() } pub fn request_adapter(