dont use softbuffer on wasm due to performance issues

Author: bgkillas

.github/workflows/wasm.yml

@@ -21,7 +21,12 @@ jobs:
 
       - name: Install wasm-pack
         run: cargo install wasm-pack
-
+      - name: Install Binaryen (wasm-opt)
+        run: |
+          BINARYEN_VERSION=version_123
+          curl -L -O https://github.com/WebAssembly/binaryen/releases/download/${BINARYEN_VERSION}/binaryen-${BINARYEN_VERSION}-x86_64-linux.tar.gz
+          tar -xzf binaryen-${BINARYEN_VERSION}-x86_64-linux.tar.gz
+          echo "$(pwd)/binaryen-${BINARYEN_VERSION}/bin" >> $GITHUB_PATH
       - name: depends
         run: |
           cd ..

Cargo.lock

@@ -27,14 +27,14 @@ crate-type = ["cdylib", "rlib"]
 wasm-opt = false
 
 [features]
-default=["skia-vulkan", "rug","fastnum", "vulkano-x11","x11", "wayland", "rayon", "bincode", "arboard"]
+default=["tiny-skia","softbuffer-x11", "rug","fastnum", "vulkano-x11","x11", "wayland", "rayon", "bincode", "arboard"]
 #default=["egui","rug","fastnum","rayon", "bincode", "arboard"]
 #default=["skia-vulkan","rug","fastnum","wayland", "rayon", "bincode", "arboard"]
 #default=["skia","rug","fastnum","wayland","softbuffer","softbuffer-wayland", "rayon", "bincode", "arboard"]
 #default=["tiny-skia","rug","fastnum", "wayland", "softbuffer", "softbuffer-wayland"]
 egui=["dep:egui","dep:eframe","rupl/egui"]
 skia=["rupl/skia" ,"rupl/winit", "dep:winit"]
-tiny-skia=["rupl/tiny-skia" ,"rupl/winit", "dep:winit", "softbuffer", "dep:tiny-skia", "rupl/tiny-skia-png", "rupl/tiny-skia-text"]
+tiny-skia=["rupl/tiny-skia" ,"rupl/winit", "dep:winit", "dep:tiny-skia", "rupl/tiny-skia-png", "rupl/tiny-skia-text"]
 softbuffer = ["dep:softbuffer"]
 rayon=["dep:rayon", "rupl/rayon", "kalc-lib?/rayon"]
 bincode=["dep:bitcode", "dep:serde", "rupl/serde", "dep:dirs", "kalc-lib?/serde"]
@@ -56,7 +56,7 @@ wasm=["dep:wasm-bindgen", "dep:console_error_panic_hook", "dep:web-sys"]
 egui={version="0.31.1",default-features = false,optional=true}
 eframe={version="0.31.1",optional=true}
 winit={version="0.30.11", default-features=false, features = ["rwh_06"],optional=true}
-softbuffer={version="0.4.6",default-features = false,features = ["kms"],optional=true}
+softbuffer={version="0.4.6",default-features = false,optional=true}
 rayon={version="1.10.0", optional=true}
 dirs={version="6.0.0", optional=true}
 bitcode = {version="0.6.6",features = ["serde"],optional = true}
@@ -65,5 +65,5 @@ rupl={version = "0.1.2",path="../rupl",default-features = false}
 kalc-lib={version="1.5.1",default-features=false,features = ["fastrand"],path="../kalc-lib",optional = true}
 wasm-bindgen = {version="0.2.100",optional = true}
 console_error_panic_hook = { version = "0.1.7", optional = true }
-web-sys = { version = "0.3.77", optional = true }
+web-sys = { version = "0.3.77", features = ["CanvasRenderingContext2d"], optional = true }
 tiny-skia = {version = "0.11.4", default-features = false, optional = true}

Cargo.toml

@@ -191,8 +191,9 @@ impl App {
             data,
             #[cfg(feature = "bincode")]
             tiny,
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
-            #[cfg(not(feature = "skia-vulkan"))]
+            #[cfg(feature = "wasm")]
+            window: None,
+            #[cfg(not(feature = "wasm"))]
             surface_state: None,
             #[cfg(any(feature = "skia", feature = "tiny-skia"))]
             input_state: rupl::types::InputState::default(),
@@ -247,6 +248,7 @@ impl App {
     }
     #[cfg(any(feature = "skia", feature = "tiny-skia"))]
     #[cfg(not(feature = "skia-vulkan"))]
+    #[cfg(not(feature = "wasm"))]
     pub(crate) fn main(&mut self, width: u32, height: u32) {
         let mut b = false;
         if let Some(buffer) = &mut self.surface_state {
@@ -281,4 +283,66 @@ impl App {
             }
         }
     }
+    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(not(feature = "skia-vulkan"))]
+    #[cfg(feature = "wasm")]
+    pub(crate) fn main(&mut self, width: u32, height: u32) {
+        let mut b = false;
+        self.plot.keybinds(&self.input_state);
+        self.plot
+            .set_screen(width as f64, height as f64, true, true);
+        #[cfg(feature = "bincode")]
+        if let Some(tiny) = std::mem::take(&mut self.tiny) {
+            self.plot.apply_tiny(tiny);
+        }
+        if let Some(n) = self.data.update(&mut self.plot) {
+            b = true;
+            self.name = n;
+        };
+        let mut v = Vec::new();
+        #[cfg(not(feature = "tiny-skia"))]
+        self.plot.update(width, height, &mut v);
+        #[cfg(feature = "tiny-skia")]
+        {
+            self.canvas = Some(self.plot.update(
+                width,
+                height,
+                &mut v,
+                std::mem::take(&mut self.canvas).unwrap(),
+            ));
+        }
+        draw_buffer_web(self.window.as_ref().unwrap(), self.canvas.as_ref().unwrap());
+        if b {
+            let name = self.name.clone();
+            if let Some(w) = self.window() {
+                if name.is_empty() {
+                    w.set_title("kalc-plot");
+                } else {
+                    w.set_title(&name);
+                }
+            }
+        }
+    }
+}
+#[cfg(feature = "wasm")]
+fn draw_buffer_web(win: &winit::window::Window, pixmap: &tiny_skia::Pixmap) {
+    use wasm_bindgen::prelude::*;
+    let canvas = get_a_canvas(win);
+    let ctx: web_sys::CanvasRenderingContext2d = canvas
+        .get_context("2d")
+        .expect("Failed to get 2d context")
+        .expect("Failed to get 2d context")
+        .dyn_into()
+        .expect("Failed to convert to CanvasRenderingContext2d");
+    let width = pixmap.width();
+    let clamped = wasm_bindgen::Clamped(pixmap.data());
+    let image = web_sys::ImageData::new_with_u8_clamped_array(clamped, width)
+        .expect("Failed to create image data");
+    ctx.put_image_data(&image, 0.0, 0.0)
+        .expect("Failed to put image data");
+
+    fn get_a_canvas(win: &winit::window::Window) -> web_sys::HtmlCanvasElement {
+        use winit::platform::web::WindowExtWebSys;
+        win.canvas().expect("Failed to get canvas")
+    }
 }

src/app.rs

@@ -161,15 +161,19 @@ struct App {
     tiny: Option<rupl::types::GraphTiny>,
     #[cfg(any(feature = "skia", feature = "tiny-skia"))]
     #[cfg(not(feature = "skia-vulkan"))]
-    #[cfg_attr(feature = "bincode", serde(skip_serializing, skip_deserializing))]
+    #[cfg_attr(feature = "bincode", serde(skip))]
+    #[cfg(not(feature = "wasm"))]
     surface_state: Option<
         softbuffer::Surface<
             std::sync::Arc<winit::window::Window>,
             std::sync::Arc<winit::window::Window>,
         >,
     >,
+    #[cfg_attr(feature = "bincode", serde(skip))]
+    #[cfg(feature = "wasm")]
+    window: Option<winit::window::Window>,
     #[cfg(any(feature = "skia", feature = "tiny-skia"))]
-    #[cfg_attr(feature = "bincode", serde(skip_serializing, skip_deserializing))]
+    #[cfg_attr(feature = "bincode", serde(skip))]
     input_state: rupl::types::InputState,
     #[cfg(any(feature = "skia", feature = "tiny-skia"))]
     name: String,