From f87b0dd1db5932977129dec56b5f92f370d9f669 Mon Sep 17 00:00:00 2001 From: Sam <16504129+sagudev@users.noreply.github.com> Date: Tue, 7 Jul 2026 11:48:39 +0200 Subject: [PATCH] [core] Make `Global` methods thin in present (#9825) Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- player/src/bin/play.rs | 4 +- player/src/lib.rs | 2 +- wgpu-core/src/present.rs | 87 +++++++++++++++++++++++----------------- 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/player/src/bin/play.rs b/player/src/bin/play.rs index ed7a4ffc8..37178cd80 100644 --- a/player/src/bin/play.rs +++ b/player/src/bin/play.rs @@ -118,7 +118,7 @@ fn main() { { struct App<'a> { window: Option>, - surface: Option, + surface: Option>, configured_surface_id: Option>, instance: &'a wgc::instance::Instance, device: &'a Arc, @@ -151,7 +151,7 @@ fn main() { } .unwrap(); self.window = Some(window); - self.surface = Some(surface); + self.surface = Some(Arc::new(surface)); } fn exiting(&mut self, _event_loop: &ActiveEventLoop) { diff --git a/player/src/lib.rs b/player/src/lib.rs index 47d1c5d56..75676064a 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -450,7 +450,7 @@ impl Player { pub fn get_surface_texture( &mut self, id: wgc::id::PointerId, - surface: &wgc::instance::Surface, + surface: &Arc, ) { let frame = surface .get_current_texture() diff --git a/wgpu-core/src/present.rs b/wgpu-core/src/present.rs index 5ba5c661a..60203e2a4 100644 --- a/wgpu-core/src/present.rs +++ b/wgpu-core/src/present.rs @@ -162,7 +162,23 @@ pub struct SurfaceOutput { } impl Surface { - pub fn get_current_texture(&self) -> Result { + pub fn get_current_texture(self: &Arc) -> Result { + let output = self.get_current_texture_inner(); + #[cfg(feature = "trace")] + if let Some(present) = self.presentation.lock().as_ref() { + if let Some(ref mut trace) = *present.device.trace.lock() { + if let Some(texture) = present.acquired_texture.as_ref() { + trace.add(Action::GetSurfaceTexture { + id: texture.to_trace(), + parent: self.to_trace(), + }); + } + } + } + output + } + + pub(crate) fn get_current_texture_inner(&self) -> Result { profiling::scope!("Surface::get_current_texture"); let (device, config) = if let Some(ref present) = *self.presentation.lock() { @@ -279,7 +295,17 @@ impl Surface { Ok(ResolvedSurfaceOutput { status, texture }) } - pub fn present(&self) -> Result { + pub fn present(self: &Arc) -> Result { + #[cfg(feature = "trace")] + if let Some(present) = self.presentation.lock().as_ref() { + if let Some(ref mut trace) = *present.device.trace.lock() { + trace.add(Action::Present(self.to_trace())); + } + } + self.present_inner() + } + + pub(crate) fn present_inner(&self) -> Result { profiling::scope!("Surface::present"); let presentation = self.presentation.lock(); @@ -378,7 +404,17 @@ impl Queue { } impl Surface { - pub fn discard(&self) -> Result<(), SurfaceError> { + pub fn discard(self: &Arc) -> Result<(), SurfaceError> { + #[cfg(feature = "trace")] + if let Some(present) = self.presentation.lock().as_ref() { + if let Some(ref mut trace) = *present.device.trace.lock() { + trace.add(Action::DiscardSurfaceTexture(self.to_trace())); + } + } + self.discard_inner() + } + + pub(crate) fn discard_inner(&self) -> Result<(), SurfaceError> { profiling::scope!("Surface::discard"); let mut presentation = self.presentation.lock(); @@ -415,9 +451,19 @@ impl Surface { Ok(()) } + pub fn release(self: &Arc) -> Result<(), SurfaceError> { + #[cfg(feature = "trace")] + if let Some(present) = self.presentation.lock().as_ref() { + if let Some(ref mut trace) = *present.device.trace.lock() { + trace.add(Action::ReleaseSurfaceTexture(self.to_trace())); + } + } + self.release_inner() + } + /// Like `discard`, drops the inner texture reference, but skips the /// HAL `discard_texture` call. Safe to call during unwinding - pub fn release(&self) -> Result<(), SurfaceError> { + pub(crate) fn release_inner(&self) -> Result<(), SurfaceError> { profiling::scope!("Surface::release"); let mut presentation = self.presentation.lock(); @@ -450,18 +496,6 @@ impl Global { let output = surface.get_current_texture()?; - #[cfg(feature = "trace")] - if let Some(present) = surface.presentation.lock().as_ref() { - if let Some(ref mut trace) = *present.device.trace.lock() { - if let Some(texture) = present.acquired_texture.as_ref() { - trace.add(Action::GetSurfaceTexture { - id: texture.to_trace(), - parent: surface.to_trace(), - }); - } - } - } - let status = output.status; let texture_id = output.texture.map(|texture| fid.assign(texture)); @@ -474,39 +508,18 @@ impl Global { pub fn surface_present(&self, surface_id: id::SurfaceId) -> Result { let surface = self.surfaces.get(surface_id); - #[cfg(feature = "trace")] - if let Some(present) = surface.presentation.lock().as_ref() { - if let Some(ref mut trace) = *present.device.trace.lock() { - trace.add(Action::Present(surface.to_trace())); - } - } - surface.present() } pub fn surface_texture_discard(&self, surface_id: id::SurfaceId) -> Result<(), SurfaceError> { let surface = self.surfaces.get(surface_id); - #[cfg(feature = "trace")] - if let Some(present) = surface.presentation.lock().as_ref() { - if let Some(ref mut trace) = *present.device.trace.lock() { - trace.add(Action::DiscardSurfaceTexture(surface.to_trace())); - } - } - surface.discard() } pub fn surface_texture_release(&self, surface_id: id::SurfaceId) -> Result<(), SurfaceError> { let surface = self.surfaces.get(surface_id); - #[cfg(feature = "trace")] - if let Some(present) = surface.presentation.lock().as_ref() { - if let Some(ref mut trace) = *present.device.trace.lock() { - trace.add(Action::ReleaseSurfaceTexture(surface.to_trace())); - } - } - surface.release() } }