Skia Raster (#26)

* skia raster

* reformat lib.rs

* set skia cache limits in image renderer

Author: execsuroot

Cargo.lock

@@ -9,7 +9,9 @@ license.workspace = true
 edition.workspace = true
 
 [features]
-log_frame_times = ["debug_timer/enable"]
+pixels_window_renderer = ["dep:pixels_window_renderer"]
+softbuffer_window_renderer = ["dep:softbuffer_window_renderer"]
+log_frame_times = ["debug_timer/enable", "pixels_window_renderer?/log_frame_times", "softbuffer_window_renderer?/log_frame_times"]
 vulkan = ["skia-safe/vulkan"]
 
 [dependencies]
@@ -18,6 +20,8 @@ debug_timer = { workspace = true }
 kurbo = { workspace = true }
 peniko = { workspace = true }
 raw-window-handle = { workspace = true }
+softbuffer_window_renderer = { workspace = true, optional = true }
+pixels_window_renderer = { workspace = true, optional = true }
 skia-safe = { version = "0.89.1", features = ["gl", "pdf", "textlayout"]}
 oaty = "0.1"
 gl = "0.14.0"

crates/anyrender_skia/Cargo.toml

@@ -1 +1,100 @@
+use anyrender::ImageRenderer;
+use debug_timer::debug_timer;
+use skia_safe::{AlphaType, Color, ColorType, ImageInfo, SurfaceProps, graphics, surfaces};
 
+use crate::{SkiaScenePainter, scene::SkiaSceneCache};
+
+pub struct SkiaImageRenderer {
+    image_info: ImageInfo,
+    surface_props: SurfaceProps,
+    scene_cache: SkiaSceneCache,
+}
+
+impl ImageRenderer for SkiaImageRenderer {
+    type ScenePainter<'a>
+        = SkiaScenePainter<'a>
+    where
+        Self: 'a;
+
+    fn new(width: u32, height: u32) -> Self {
+        graphics::set_font_cache_count_limit(100);
+        graphics::set_typeface_cache_count_limit(100);
+        graphics::set_resource_cache_total_bytes_limit(10485760);
+
+        Self {
+            image_info: ImageInfo::new(
+                (width as i32, height as i32),
+                ColorType::RGBA8888,
+                AlphaType::Opaque,
+                None,
+            ),
+            surface_props: SurfaceProps::default(),
+            scene_cache: SkiaSceneCache::default(),
+        }
+    }
+
+    fn resize(&mut self, width: u32, height: u32) {
+        self.image_info = ImageInfo::new(
+            (width as i32, height as i32),
+            ColorType::RGBA8888,
+            AlphaType::Opaque,
+            None,
+        );
+    }
+
+    fn reset(&mut self) {}
+
+    fn render_to_vec<F: FnOnce(&mut Self::ScenePainter<'_>)>(
+        &mut self,
+        draw_fn: F,
+        buffer: &mut Vec<u8>,
+    ) {
+        debug_timer!(timer, feature = "log_frame_times");
+
+        let mut surface = surfaces::wrap_pixels(
+            &self.image_info,
+            &mut buffer[..],
+            None,
+            Some(&self.surface_props),
+        )
+        .unwrap();
+
+        surface.canvas().clear(Color::WHITE);
+
+        draw_fn(&mut SkiaScenePainter {
+            inner: surface.canvas(),
+            cache: &mut self.scene_cache,
+        });
+        timer.record_time("render");
+
+        self.scene_cache.next_gen();
+        timer.record_time("cache next gen");
+
+        timer.print_times("skia_raster: ");
+    }
+
+    fn render<F: FnOnce(&mut Self::ScenePainter<'_>)>(&mut self, draw_fn: F, buffer: &mut [u8]) {
+        debug_timer!(timer, feature = "log_frame_times");
+
+        let mut surface = surfaces::wrap_pixels(
+            &self.image_info,
+            &mut buffer[..],
+            None,
+            Some(&self.surface_props),
+        )
+        .unwrap();
+
+        surface.canvas().clear(Color::WHITE);
+
+        draw_fn(&mut SkiaScenePainter {
+            inner: surface.canvas(),
+            cache: &mut self.scene_cache,
+        });
+        timer.record_time("render");
+
+        self.scene_cache.next_gen();
+        timer.record_time("cache next gen");
+
+        timer.print_times("skia_raster: ");
+    }
+}

crates/anyrender_skia/src/image_renderer.rs

@@ -11,5 +11,6 @@ mod opengl;
 #[cfg(feature = "vulkan")]
 mod vulkan;
 
+pub use image_renderer::SkiaImageRenderer;
 pub use scene::SkiaScenePainter;
-pub use window_renderer::SkiaWindowRenderer;
+pub use window_renderer::*;

crates/anyrender_skia/src/lib.rs

@@ -43,7 +43,7 @@ impl Default for SkiaSceneCache {
             typeface: GenerationalCache::new(1),
             normalized_typeface: GenerationalCache::new(1),
             image_shader: GenerationalCache::new(1),
-            font: GenerationalCache::new(1),
+            font: GenerationalCache::new(10),
             font_mgr: FontMgr::new(),
             glyph_id_buf: Default::default(),
             glyph_pos_buf: Default::default(),

crates/anyrender_skia/src/scene.rs

@@ -109,3 +109,24 @@ impl WindowRenderer for SkiaWindowRenderer {
         timer.print_times("skia: ");
     }
 }
+
+#[cfg(any(
+    feature = "pixels_window_renderer",
+    feature = "softbuffer_window_renderer"
+))]
+pub mod raster {
+    #[cfg(feature = "pixels_window_renderer")]
+    pub use pixels_window_renderer::PixelsWindowRenderer;
+    #[cfg(feature = "softbuffer_window_renderer")]
+    pub use softbuffer_window_renderer::SoftbufferWindowRenderer;
+
+    #[cfg(feature = "pixels_window_renderer")]
+    pub type SkiaRasterWindowRenderer =
+        PixelsWindowRenderer<crate::image_renderer::SkiaImageRenderer>;
+    #[cfg(all(
+        feature = "softbuffer_window_renderer",
+        not(feature = "pixels_window_renderer")
+    ))]
+    pub type SkiaRasterWindowRenderer =
+        SoftbufferWindowRenderer<crate::image_renderer::SkiaImageRenderer>;
+}