From eda2630fa5c1fe84b3fe4cc9d102416d05967ba2 Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Wed, 26 Aug 2026 19:48:42 +0200 Subject: [PATCH] Remove ContextCore from CoreAdapter Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu/src/api/adapter.rs | 8 ++--- wgpu/src/api/instance.rs | 5 +-- wgpu/src/backend/wgpu_core.rs | 60 ++++++++++++++++------------------- 3 files changed, 30 insertions(+), 43 deletions(-) diff --git a/wgpu/src/api/adapter.rs b/wgpu/src/api/adapter.rs index dd019d1eb..4a1f6ec75 100644 --- a/wgpu/src/api/adapter.rs +++ b/wgpu/src/api/adapter.rs @@ -80,11 +80,7 @@ impl Adapter { desc: &DeviceDescriptor<'_>, ) -> Result<(Device, Queue), RequestDeviceError> { let core_adapter = self.inner.as_core(); - let (device, queue) = unsafe { - core_adapter - .context - .create_device_from_hal(core_adapter, hal_device, desc) - }?; + let (device, queue) = unsafe { core_adapter.create_device_from_hal(hal_device, desc) }?; Ok(( Device { @@ -133,7 +129,7 @@ impl Adapter { ) -> Option + WasmNotSendSync> { let adapter = self.inner.as_core_opt()?; - unsafe { adapter.context.adapter_as_hal::(adapter) } + unsafe { adapter.as_hal::() } } #[cfg(custom)] diff --git a/wgpu/src/api/instance.rs b/wgpu/src/api/instance.rs index 32b787564..3b095792a 100644 --- a/wgpu/src/api/instance.rs +++ b/wgpu/src/api/instance.rs @@ -390,10 +390,7 @@ impl Instance { ) -> Adapter { let core_instance = self.inner.as_core(); let wgpu_adapter = unsafe { core_instance.create_adapter_from_hal(hal_adapter) }; - let core = backend::wgpu_core::CoreAdapter { - context: core_instance.clone(), - wgpu_adapter, - }; + let core = backend::wgpu_core::CoreAdapter { wgpu_adapter }; Adapter { inner: core.into() } } diff --git a/wgpu/src/backend/wgpu_core.rs b/wgpu/src/backend/wgpu_core.rs index 783f0f0de..4d72cbba8 100644 --- a/wgpu/src/backend/wgpu_core.rs +++ b/wgpu/src/backend/wgpu_core.rs @@ -83,32 +83,6 @@ impl ContextWgpuCore { ) -> Arc { unsafe { self.0.create_adapter_from_hal(hal_adapter.into()) } } - - pub unsafe fn adapter_as_hal( - &self, - adapter: &CoreAdapter, - ) -> Option + WasmNotSendSync> { - unsafe { adapter.wgpu_adapter.clone().as_hal::() } - } - - pub unsafe fn create_device_from_hal( - &self, - adapter: &CoreAdapter, - hal_device: hal::OpenDevice, - desc: &crate::DeviceDescriptor<'_>, - ) -> Result<(CoreDevice, CoreQueue), crate::RequestDeviceError> { - let (device, queue) = unsafe { - adapter.wgpu_adapter.create_device_and_queue_from_hal( - hal_device.into(), - &desc.map_label(|l| l.map(Borrowed)), - ) - }?; - let device = CoreDevice { - wgpu_device: device.clone(), - }; - let queue = CoreQueue { wgpu_queue: queue }; - Ok((device, queue)) - } } fn map_buffer_copy_view( @@ -193,19 +167,43 @@ impl CoreSurface { #[derive(Clone)] pub struct CoreAdapter { - pub(crate) context: ContextWgpuCore, pub(crate) wgpu_adapter: Arc, } impl fmt::Debug for CoreAdapter { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("CoreAdapter") - .field("context", &self.context) .field("wgpu_adapter", &Arc::as_ptr(&self.wgpu_adapter)) .finish() } } +impl CoreAdapter { + pub unsafe fn as_hal( + &self, + ) -> Option + WasmNotSendSync> { + unsafe { self.wgpu_adapter.clone().as_hal::() } + } + + pub unsafe fn create_device_from_hal( + &self, + hal_device: hal::OpenDevice, + desc: &crate::DeviceDescriptor<'_>, + ) -> Result<(CoreDevice, CoreQueue), crate::RequestDeviceError> { + let (device, queue) = unsafe { + self.wgpu_adapter.create_device_and_queue_from_hal( + hal_device.into(), + &desc.map_label(|l| l.map(Borrowed)), + ) + }?; + let device = CoreDevice { + wgpu_device: device.clone(), + }; + let queue = CoreQueue { wgpu_queue: queue }; + Ok((device, queue)) + } +} + #[derive(Debug, Clone)] pub struct CoreDevice { pub(crate) wgpu_device: Arc, @@ -645,10 +643,7 @@ impl dispatch::InstanceInterface for ContextWgpuCore { wgt::Backends::all(), ); let adapter = adapter.map(|wgpu_adapter| { - let core = CoreAdapter { - context: self.clone(), - wgpu_adapter, - }; + let core = CoreAdapter { wgpu_adapter }; let generic: dispatch::DispatchAdapter = core.into(); generic }); @@ -695,7 +690,6 @@ impl dispatch::InstanceInterface for ContextWgpuCore { .into_iter() .map(|adapter| { let core = crate::backend::wgpu_core::CoreAdapter { - context: self.clone(), wgpu_adapter: adapter, }; core.into()