move surface/pixmap reallocation optimization to rupl

Author: bgkillas

Cargo.lock

@@ -34,7 +34,7 @@ default=["skia-vulkan", "rug","fastnum", "vulkano-x11","x11", "wayland", "rayon"
 #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", "dep:tiny-skia", "rupl/tiny-skia-png", "rupl/tiny-skia-text"]
+tiny-skia=["rupl/tiny-skia" ,"rupl/winit", "dep:winit", "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"]
@@ -65,5 +65,4 @@ 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", features = ["CanvasRenderingContext2d"], optional = true }
-tiny-skia = {version = "0.11.4", default-features = false, optional = true}
+web-sys = { version = "0.3.77", features = ["CanvasRenderingContext2d"], optional = true }

Cargo.toml

@@ -116,8 +116,6 @@ impl App {
         }
         data.update(&mut plot);
         Self {
-            #[cfg(feature = "tiny-skia")]
-            canvas: None,
             plot,
             data,
             #[cfg(feature = "bincode")]
@@ -185,8 +183,6 @@ impl App {
         plot.mult = 1.0 / 16.0;
         data.update(&mut plot);
         Self {
-            #[cfg(feature = "tiny-skia")]
-            canvas: None,
             plot,
             data,
             #[cfg(feature = "bincode")]
@@ -268,12 +264,7 @@ impl App {
             self.plot.update(width, height, &mut buffer);
             #[cfg(feature = "tiny-skia")]
             {
-                self.canvas = Some(self.plot.update(
-                    width,
-                    height,
-                    &mut buffer,
-                    std::mem::take(&mut self.canvas).unwrap(),
-                ));
+                self.plot.update(width, height, &mut buffer);
             }
             buffer.present().unwrap();
         }
@@ -304,14 +295,12 @@ impl App {
         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(),
-            ));
+            self.plot.update(width, height, &mut v);
         }
-        draw_buffer_web(self.window.as_ref().unwrap(), self.canvas.as_ref().unwrap());
+        draw_buffer_web(
+            self.window.as_ref().unwrap(),
+            self.plot.canvas.as_ref().unwrap(),
+        );
         if b {
             let name = self.name.clone();
             if let Some(w) = self.window() {

src/app.rs

@@ -154,9 +154,6 @@ pub fn main() {
 struct App {
     plot: Graph,
     data: Data,
-    #[cfg(feature = "tiny-skia")]
-    #[cfg_attr(feature = "bincode", serde(skip))]
-    canvas: Option<tiny_skia::Pixmap>,
     #[cfg(feature = "bincode")]
     tiny: Option<rupl::types::GraphTiny>,
     #[cfg(any(feature = "skia", feature = "tiny-skia"))]

src/lib.rs

@@ -113,10 +113,6 @@ impl winit::application::ApplicationHandler for App {
                     state.request_redraw();
                     #[cfg(feature = "skia-vulkan")]
                     self.plot.resize();
-                    #[cfg(feature = "tiny-skia")]
-                    {
-                        self.canvas = Some(tiny_skia::Pixmap::new(_d.width, _d.height).unwrap());
-                    }
                 }
                 #[cfg(not(any(feature = "wasm", feature = "skia-vulkan")))]
                 {
@@ -132,10 +128,6 @@ impl winit::application::ApplicationHandler for App {
                             std::num::NonZeroU32::new(_d.height).unwrap(),
                         )
                         .unwrap();
-                    #[cfg(feature = "tiny-skia")]
-                    {
-                        self.canvas = Some(tiny_skia::Pixmap::new(_d.width, _d.height).unwrap());
-                    }
                 }
             }
             winit::event::WindowEvent::RedrawRequested => {
@@ -146,10 +138,6 @@ impl winit::application::ApplicationHandler for App {
                     let size = state.inner_size();
                     (size.width, size.height)
                 };
-                #[cfg(feature = "tiny-skia")]
-                if self.canvas.is_none() {
-                    self.canvas = Some(tiny_skia::Pixmap::new(width, height).unwrap());
-                }
                 if self.touch_positions.len() > 1
                     && self.touch_positions.len() == self.last_touch_positions.len()
                 {