From 7871d100c8c44f7944ef30a9d61037c4d419203f Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Fri, 24 Jul 2020 10:26:39 -0400 Subject: [PATCH] Convert to tracing for logging and add fmt logger --- Cargo.toml | 7 ++----- examples/capture/main.rs | 3 ++- examples/framework.rs | 15 +++++++-------- examples/hello-compute/main.rs | 7 +------ examples/hello-triangle/main.rs | 3 ++- examples/hello/main.rs | 3 ++- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f655917a1..f846d1ece 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,14 +27,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"] package = "wgpu-core" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "6182495102e33ea22c354539aba06ef3bf393751" +rev = "11b3a95671d096aae2eac0d187be5472b5ab91c0" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "6182495102e33ea22c354539aba06ef3bf393751" +rev = "11b3a95671d096aae2eac0d187be5472b5ab91c0" [dependencies] arrayvec = "0.5" @@ -87,9 +87,6 @@ test = true [target.'cfg(target_os = "macos")'.dependencies] objc = "0.2.7" -[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -env_logger = "0.7" - [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen = "0.2.62" web-sys = { version = "0.3.39", features = [ diff --git a/examples/capture/main.rs b/examples/capture/main.rs index 778f7f439..a25e2f594 100644 --- a/examples/capture/main.rs +++ b/examples/capture/main.rs @@ -196,7 +196,8 @@ impl BufferDimensions { fn main() { #[cfg(not(target_arch = "wasm32"))] { - env_logger::init(); + #[cfg(feature = "subscriber")] + wgpu::util::initialize_default_subscriber(None); futures::executor::block_on(run("red.png")); } #[cfg(target_arch = "wasm32")] diff --git a/examples/framework.rs b/examples/framework.rs index 08b7617fd..3aff1b266 100644 --- a/examples/framework.rs +++ b/examples/framework.rs @@ -72,8 +72,13 @@ struct Setup { } async fn setup(title: &str) -> Setup { - #[cfg(not(target_arch = "wasm32"))] - env_logger::init(); + #[cfg(feature = "subscriber")] + { + let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACE"); + wgpu::util::initialize_default_subscriber( + chrome_tracing_dir.as_ref().map(std::path::Path::new).ok(), + ); + }; #[cfg(target_arch = "wasm32")] console_log::init().expect("could not initialize logger"); @@ -155,12 +160,6 @@ fn start( ) { #[cfg(not(target_arch = "wasm32"))] let (mut pool, spawner) = { - #[cfg(feature = "subscriber")] - { - let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACING"); - wgpu::util::initialize_default_subscriber(chrome_tracing_dir.ok()); - }; - let local_pool = futures::executor::LocalPool::new(); let spawner = local_pool.spawner(); (local_pool, spawner) diff --git a/examples/hello-compute/main.rs b/examples/hello-compute/main.rs index 89892a6c6..c76326fcc 100644 --- a/examples/hello-compute/main.rs +++ b/examples/hello-compute/main.rs @@ -134,13 +134,8 @@ async fn execute_gpu(numbers: Vec) -> Vec { fn main() { #[cfg(not(target_arch = "wasm32"))] { - env_logger::init(); - #[cfg(feature = "subscriber")] - { - let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACING"); - wgpu::util::initialize_default_subscriber(chrome_tracing_dir.ok()); - }; + wgpu::util::initialize_default_subscriber(None); futures::executor::block_on(run()); } diff --git a/examples/hello-triangle/main.rs b/examples/hello-triangle/main.rs index 173e41cfd..3083c84e8 100644 --- a/examples/hello-triangle/main.rs +++ b/examples/hello-triangle/main.rs @@ -141,7 +141,8 @@ fn main() { let window = winit::window::Window::new(&event_loop).unwrap(); #[cfg(not(target_arch = "wasm32"))] { - env_logger::init(); + #[cfg(feature = "subscriber")] + wgpu::util::initialize_default_subscriber(None); // Temporarily avoid srgb formats for the swapchain on the web futures::executor::block_on(run(event_loop, window, wgpu::TextureFormat::Bgra8UnormSrgb)); diff --git a/examples/hello/main.rs b/examples/hello/main.rs index b3aff1c14..8a71cb6db 100644 --- a/examples/hello/main.rs +++ b/examples/hello/main.rs @@ -16,7 +16,8 @@ async fn run() { fn main() { #[cfg(not(target_arch = "wasm32"))] { - env_logger::init(); + #[cfg(feature = "subscriber")] + wgpu::util::initialize_default_subscriber(None); futures::executor::block_on(run()); } #[cfg(target_arch = "wasm32")]