Fix WASM compilation

rerun-io · Apr 13, 2022 · 4e9bb87 · 4e9bb87
1 parent 3efe681
commit 4e9bb87
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/viewer/src/app.rs b/viewer/src/app.rs
@@ -56,7 +56,7 @@ struct AppState {
  context_panel: crate::context_panel::ContextPanel,
  time_panel: crate::time_panel::TimePanel,
 
- #[cfg(feature = "puffin")]
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
  #[serde(skip)]
  profiler: crate::misc::profiler::Profiler,
 }
@@ -90,7 +90,7 @@ impl AppState {
  ui.close_menu();
  }
 
- #[cfg(feature = "puffin")]
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
  if ui
  .button("Profile viewer")
  .on_hover_text(
@@ -125,7 +125,7 @@ impl AppState {
  space_view,
  context_panel,
  time_panel,
- #[cfg(feature = "puffin")]
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
  profiler: _,
  } = self;
 

diff --git a/viewer/src/lib.rs b/viewer/src/lib.rs
@@ -34,7 +34,7 @@ pub use web::start;
 #[macro_export]
 macro_rules! profile_function {
  ($($arg: tt)*) => {
- #[cfg(feature = "puffin")]
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
  puffin::profile_function!($($arg)*);
  };
 }
@@ -44,7 +44,7 @@ macro_rules! profile_function {
 #[macro_export]
 macro_rules! profile_scope {
  ($($arg: tt)*) => {
- #[cfg(feature = "puffin")]
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
  puffin::profile_scope!($($arg)*);
  };
 }
diff --git a/viewer/src/misc.rs b/viewer/src/misc.rs
@@ -3,7 +3,7 @@ mod clipboard;
 mod image_cache;
 pub(crate) mod log_db;
 pub(crate) mod mesh_loader;
-#[cfg(feature = "puffin")]
+#[cfg(all(feature = "puffin", not(target_arch = "wasm32")))]
 pub(crate) mod profiler;
 pub(crate) mod time_axis;
 mod time_control;

diff --git a/viewer/src/misc/clipboard.rs b/viewer/src/misc/clipboard.rs
@@ -13,7 +13,7 @@ impl Clipboard {
  }
  }
 
- #[cfg(feature = "puffin")] // only used sometimes
+ #[cfg(all(feature = "puffin", not(target_arch = "wasm32")))] // only used sometimes
  pub fn set_text(&mut self, text: String) {
  if let Some(clipboard) = &mut self.arboard {
  if let Err(err) = clipboard.set_text(text) {

diff --git a/viewer/src/ui/context_panel.rs b/viewer/src/ui/context_panel.rs
@@ -133,6 +133,7 @@ pub(crate) fn show_detailed_log_msg(context: &mut ViewerContext, ui: &mut egui::
  }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn image_options(ui: &mut egui::Ui, image: &log_types::Image) {
  // TODO: support copying images on web
  #[cfg(not(target_arch = "wasm32"))]
@@ -167,6 +168,7 @@ fn image_options(ui: &mut egui::Ui, image: &log_types::Image) {
  }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn to_rgba_unultiplied(image: &log_types::Image) -> Vec<u8> {
  match image.format {
  log_types::ImageFormat::Luminance8 => {
@@ -175,6 +177,7 @@ fn to_rgba_unultiplied(image: &log_types::Image) -> Vec<u8> {
  }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn to_image_image(image: &log_types::Image) -> Option<image::DynamicImage> {
  let [w, h] = image.size;
  match image.format {