From 10245cece90055685f383eda07a0ebb5ddcb05e1 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 3 Mar 2021 19:59:29 -0500 Subject: [PATCH] Early tracing of swapchain-related things, clean up the hub API --- player/src/lib.rs | 12 ++++------ wgpu-core/src/device/mod.rs | 6 +++-- wgpu-core/src/device/trace.rs | 2 +- wgpu-core/src/hub.rs | 24 ------------------- wgpu-core/src/instance.rs | 44 ++++++++++++++--------------------- wgpu-core/src/swap_chain.rs | 23 +++++++++--------- 6 files changed, 39 insertions(+), 72 deletions(-) diff --git a/player/src/lib.rs b/player/src/lib.rs index dfb956b39..fe2573e2c 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -196,13 +196,11 @@ impl GlobalPlay for wgc::hub::Global { self.sampler_drop::(id); } A::GetSwapChainTexture { id, parent_id } => { - if let Some(id) = id { - self.device_maintain_ids::(device).unwrap(); - self.swap_chain_get_current_texture_view::(parent_id, id) - .unwrap() - .view_id - .unwrap(); - } + self.device_maintain_ids::(device).unwrap(); + self.swap_chain_get_current_texture_view::(parent_id, id) + .unwrap() + .view_id + .unwrap(); } A::CreateBindGroupLayout(id, desc) => { let (_, error) = self.device_create_bind_group_layout::(device, &desc, id); diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index 95e3311a7..60777f04a 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -4022,7 +4022,8 @@ impl Global { let id = hub .bind_group_layouts - .register_error(id_in, "", &mut token); + .prepare(id_in) + .assign_error("", &mut token); (id, Some(error)) } @@ -4149,7 +4150,8 @@ impl Global { let id = hub .bind_group_layouts - .register_error(id_in, "", &mut token); + .prepare(id_in) + .assign_error("", &mut token); (id, Some(error)) } diff --git a/wgpu-core/src/device/trace.rs b/wgpu-core/src/device/trace.rs index c67e64da0..80ce1c69c 100644 --- a/wgpu-core/src/device/trace.rs +++ b/wgpu-core/src/device/trace.rs @@ -50,7 +50,7 @@ pub enum Action<'a> { DestroySampler(id::SamplerId), CreateSwapChain(id::SwapChainId, wgt::SwapChainDescriptor), GetSwapChainTexture { - id: Option, + id: id::TextureViewId, parent_id: id::SwapChainId, }, PresentSwapChain(id::SwapChainId), diff --git a/wgpu-core/src/hub.rs b/wgpu-core/src/hub.rs index 3849aa664..fb784d507 100644 --- a/wgpu-core/src/hub.rs +++ b/wgpu-core/src/hub.rs @@ -491,26 +491,6 @@ impl> Registry>( - &self, - id_in: >::Input, - value: T, - token: &mut Token, - ) -> Valid { - self.prepare(id_in).assign(value, token) - } - - //TODO: consider remove this once everything uses `prepare` - pub(crate) fn register_error>( - &self, - id_in: >::Input, - label: &str, - token: &mut Token, - ) -> I { - self.prepare(id_in).assign_error(label, token) - } - pub fn unregister_locked(&self, id: I, guard: &mut Storage) -> Option { let value = guard.remove(id); //Note: careful about the order here! @@ -531,10 +511,6 @@ impl> Registry String { let guard = self.data.read(); diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs index 4379525ef..a9168d842 100644 --- a/wgpu-core/src/instance.rs +++ b/wgpu-core/src/instance.rs @@ -627,7 +627,7 @@ impl Global { }; let mut token = Token::root(); - let id = self.surfaces.register_identity(id_in, surface, &mut token); + let id = self.surfaces.prepare(id_in).assign(surface, &mut token); id.0 } @@ -649,7 +649,7 @@ impl Global { }; let mut token = Token::root(); - let id = self.surfaces.register_identity(id_in, surface, &mut token); + let id = self.surfaces.prepare(id_in).assign(surface, &mut token); id.0 } @@ -675,11 +675,9 @@ impl Global { for raw in inst.enumerate_adapters() { let adapter = Adapter::new(raw); tracing::info!("Adapter {} {:?}", backend_info, adapter.raw.info); - let id = hub.adapters.register_identity( - id_backend.clone(), - adapter, - &mut token, - ); + let id = hub.adapters + .prepare(id_backend.clone()) + .assign(adapter, &mut token); adapters.push(id.0); } } @@ -825,11 +823,9 @@ impl Global { if selected < adapters_backend.len() { let adapter = Adapter::new(adapters_backend.swap_remove(selected)); tracing::info!("Adapter {} {:?}", info_adapter, adapter.raw.info); - let id = backend_hub(self).adapters.register_identity( - id_backend.take().unwrap(), - adapter, - &mut token, - ); + let id = backend_hub(self).adapters + .prepare(id_backend.take().unwrap()) + .assign(adapter, &mut token); return Ok(id.0); } selected -= adapters_backend.len(); @@ -927,16 +923,13 @@ impl Global { let mut token = Token::root(); let (mut adapter_guard, _) = hub.adapters.write(&mut token); - match adapter_guard.get_mut(adapter_id) { - Ok(adapter) => { - if adapter.life_guard.ref_count.take().unwrap().load() == 1 { - hub.adapters - .unregister_locked(adapter_id, &mut *adapter_guard); - } - } - Err(_) => { - hub.adapters.free_id(adapter_id); - } + let free = match adapter_guard.get_mut(adapter_id) { + Ok(adapter) => adapter.life_guard.ref_count.take().unwrap().load() == 1, + Err(_) => true, + }; + if free { + hub.adapters + .unregister_locked(adapter_id, &mut *adapter_guard); } } } @@ -953,6 +946,7 @@ impl Global { let hub = B::hub(self); let mut token = Token::root(); + let fid = hub.devices.prepare(id_in); let error = loop { let (adapter_guard, mut token) = hub.adapters.read(&mut token); @@ -964,13 +958,11 @@ impl Global { Ok(device) => device, Err(e) => break e, }; - let id = hub.devices.register_identity(id_in, device, &mut token); + let id = fid.assign(device, &mut token); return (id.0, None); }; - let id = hub - .devices - .register_error(id_in, desc.label.borrow_or_default(), &mut token); + let id = fid.assign_error(desc.label.borrow_or_default(), &mut token); (id, Some(error)) } } diff --git a/wgpu-core/src/swap_chain.rs b/wgpu-core/src/swap_chain.rs index 65fa57149..db493f183 100644 --- a/wgpu-core/src/swap_chain.rs +++ b/wgpu-core/src/swap_chain.rs @@ -143,6 +143,7 @@ impl Global { let hub = B::hub(self); let mut token = Token::root(); + let fid = hub.texture_views.prepare(view_id_in); let (mut surface_guard, mut token) = self.surfaces.write(&mut token); let surface = surface_guard @@ -153,8 +154,16 @@ impl Global { let sc = swap_chain_guard .get_mut(swap_chain_id) .map_err(|_| SwapChainError::Invalid)?; - #[cfg_attr(not(feature = "trace"), allow(unused_variables))] + + #[allow(unused_variables)] let device = &device_guard[sc.device_id.value]; + #[cfg(feature = "trace")] + if let Some(ref trace) = device.trace { + trace.lock().add(Action::GetSwapChainTexture { + id: fid.id(), + parent_id: swap_chain_id, + }); + } let suf = B::get_surface_mut(surface); let (image, status) = match unsafe { suf.acquire_image(FRAME_TIMEOUT_MS * 1_000_000) } { @@ -206,9 +215,7 @@ impl Global { }; let ref_count = view.life_guard.add_ref(); - let id = hub - .texture_views - .register_identity(view_id_in, view, &mut token); + let id = fid.assign(view, &mut token); if sc.acquired_view_id.is_some() { return Err(SwapChainError::AlreadyAcquired); @@ -224,14 +231,6 @@ impl Global { None => None, }; - #[cfg(feature = "trace")] - if let Some(ref trace) = device.trace { - trace.lock().add(Action::GetSwapChainTexture { - id: view_id, - parent_id: swap_chain_id, - }); - } - Ok(SwapChainOutput { status, view_id }) }