From ece80019f8ea2c3438bff4705422ed996751124c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20B=C3=B6l=C3=B6ny?= Date: Sun, 19 Jul 2020 22:41:27 +0200 Subject: [PATCH] [rs] Move logger init earlier in the example framework --- wgpu/examples/framework.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wgpu/examples/framework.rs b/wgpu/examples/framework.rs index 393a78bd5a..f12ab437b0 100644 --- a/wgpu/examples/framework.rs +++ b/wgpu/examples/framework.rs @@ -69,6 +69,12 @@ struct Setup { } async fn setup(title: &str) -> Setup { + #[cfg(not(target_arch = "wasm32"))] + env_logger::init(); + + #[cfg(target_arch = "wasm32")] + console_log::init().expect("could not initialize logger"); + let event_loop = EventLoop::new(); let mut builder = winit::window::WindowBuilder::new(); builder = builder.with_title(title); @@ -141,8 +147,6 @@ fn start( ) { #[cfg(not(target_arch = "wasm32"))] let (mut pool, spawner) = { - env_logger::init(); - #[cfg(feature = "subscriber")] { let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACING"); @@ -170,7 +174,7 @@ fn start( } std::panic::set_hook(Box::new(console_error_panic_hook::hook)); - console_log::init().expect("could not initialize logger"); + // On wasm, append the canvas to the document body web_sys::window() .and_then(|win| win.document())