diff --git a/Cargo.lock b/Cargo.lock index 6b17eb123..dee439a82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1250,6 +1250,34 @@ dependencies = [ "serde", ] +[[package]] +name = "tracing" +version = "0.1.15" +source = "git+https://github.com/tokio-rs/tracing?rev=845746a2a302f0dfac88ba56ea37dc1e1cb0cd85#845746a2a302f0dfac88ba56ea37dc1e1cb0cd85" +dependencies = [ + "cfg-if", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.8" +source = "git+https://github.com/tokio-rs/tracing?rev=845746a2a302f0dfac88ba56ea37dc1e1cb0cd85#845746a2a302f0dfac88ba56ea37dc1e1cb0cd85" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.10" +source = "git+https://github.com/tokio-rs/tracing?rev=845746a2a302f0dfac88ba56ea37dc1e1cb0cd85#845746a2a302f0dfac88ba56ea37dc1e1cb0cd85" +dependencies = [ + "lazy_static", +] + [[package]] name = "typenum" version = "1.12.0" @@ -1441,6 +1469,7 @@ dependencies = [ "serde", "smallvec", "spirv_headers", + "tracing", "vec_map", "wgpu-types", ] diff --git a/player/src/main.rs b/player/src/main.rs index 439435048..d42e509ed 100644 --- a/player/src/main.rs +++ b/player/src/main.rs @@ -441,7 +441,7 @@ fn main() { env_logger::init(); #[cfg(feature = "renderdoc")] - let mut rd = renderdoc::RenderDoc::::new() + let mut _rd = renderdoc::RenderDoc::::new() .expect("Failed to connect to RenderDoc: are you running without it?"); //TODO: setting for the backend bits @@ -514,14 +514,14 @@ fn main() { #[cfg(not(feature = "winit"))] { #[cfg(feature = "renderdoc")] - rd.start_frame_capture(ptr::null(), ptr::null()); + _rd.start_frame_capture(ptr::null(), ptr::null()); while let Some(action) = actions.pop() { gfx_select!(device => global.process(device, action, &dir, &mut command_buffer_id_manager)); } #[cfg(feature = "renderdoc")] - rd.end_frame_capture(ptr::null(), ptr::null()); + _rd.end_frame_capture(ptr::null(), ptr::null()); gfx_select!(device => global.device_poll(device, true)); } #[cfg(feature = "winit")] diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 7cd619c50..665516367 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -34,6 +34,7 @@ ron = { version = "0.5", optional = true } serde = { version = "1.0", features = ["serde_derive"], optional = true } smallvec = "1" spirv_headers = { version = "1.4.2" } +tracing = { git = "https://github.com/tokio-rs/tracing", rev = "845746a2a302f0dfac88ba56ea37dc1e1cb0cd85" } vec_map = "0.8.1" [dependencies.naga] diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs index 15ae7b4dc..9aadda85c 100644 --- a/wgpu-core/src/command/bundle.rs +++ b/wgpu-core/src/command/bundle.rs @@ -43,6 +43,7 @@ use crate::{ hub::{GfxBackend, Global, GlobalIdentityHandlerFactory, Input, Storage, Token}, id, resource::BufferUse, + span, track::TrackerSet, LifeGuard, RefCount, Stored, MAX_BIND_GROUPS, }; @@ -62,6 +63,7 @@ impl RenderBundleEncoder { parent_id: id::DeviceId, base: Option>, ) -> Self { + span!(_guard, TRACE, "RenderBundleEncoder::new"); RenderBundleEncoder { base: base.unwrap_or_else(BasePass::new), parent_id, @@ -481,6 +483,7 @@ impl Global { desc: &wgt::RenderBundleDescriptor