parallelize command encoding

Uriopass · Feb 8, 2024 · 41d1a56 · 41d1a56
1 parent d73e90d
commit 41d1a56
Show file tree

Hide file tree

Showing 10 changed files with 335 additions and 281 deletions.
diff --git a/engine/src/drawables/mod.rs b/engine/src/drawables/mod.rs
@@ -1,5 +1,4 @@
 use crate::GfxContext;
-use std::rc::Rc;
 use wgpu::RenderPass;
 
 mod instanced_mesh;
@@ -20,7 +19,7 @@ use std::sync::Arc;
 
 pub type IndexType = u32;
 
-pub trait Drawable {
+pub trait Drawable: Send + Sync {
     fn draw<'a>(&'a self, gfx: &'a GfxContext, rp: &mut RenderPass<'a>);
 
     #[allow(unused)]
@@ -50,23 +49,6 @@ impl<T: ?Sized + Drawable> Drawable for Arc<T> {
     }
 }
 
-impl<T: ?Sized + Drawable> Drawable for Rc<T> {
-    fn draw<'a>(&'a self, gfx: &'a GfxContext, rp: &mut RenderPass<'a>) {
-        let s: &T = self;
-        s.draw(gfx, rp);
-    }
-
-    fn draw_depth<'a>(
-        &'a self,
-        gfx: &'a GfxContext,
-        rp: &mut RenderPass<'a>,
-        shadow_cascade: Option<&Matrix4>,
-    ) {
-        let s: &T = self;
-        s.draw_depth(gfx, rp, shadow_cascade);
-    }
-}
-
 impl<T: Drawable> Drawable for Option<T> {
     fn draw<'a>(&'a self, gfx: &'a GfxContext, rp: &mut RenderPass<'a>) {
         if let Some(s) = self {

diff --git a/engine/src/framework.rs b/engine/src/framework.rs
@@ -1,3 +1,4 @@
+use rayon::ThreadPoolBuilder;
 use std::sync::Arc;
 use std::time::Instant;
 
@@ -123,23 +124,18 @@ async fn run<S: State>(el: EventLoop<()>, window: Arc<Window>) {
                         state.update(&mut ctx);
 
                         let (mut enc, view) = ctx.gfx.start_frame(&sco);
-                        ctx.engine_time = ctx
+                        (ctx.engine_time, ctx.gui_time) = ctx
                             .gfx
-                            .render_objs(&mut enc, &view, |fc| state.render(fc))
-                            .as_secs_f32();
-
-                        let gui_start = Instant::now();
-                        #[allow(unused_mut)]
-                        ctx.gfx.render_gui(&mut enc, &view, |mut gctx| {
-                            #[cfg(feature = "yakui")]
-                            ctx.yakui.render(&mut gctx, || {
-                                state.render_yakui();
-                            });
-                            ctx.egui.render(gctx, |ui| {
-                                state.render_gui(ui);
+                            .render(&mut enc, &view, &mut state, |state, mut gctx| {
+                                #[cfg(feature = "yakui")]
+                                ctx.yakui.render(&mut gctx, || {
+                                    state.render_yakui();
+                                });
+                                ctx.egui.render(gctx, |ui| {
+                                    state.render_gui(ui);
+                                });
                             });
-                        });
-                        ctx.gui_time = gui_start.elapsed().as_secs_f32();
+
                         ctx.gfx.finish_frame(enc);
                         ctx.gfx.window.set_cursor_icon(get_cursor_icon());
                         ctx.input.end_frame();
@@ -170,6 +166,7 @@ pub fn init() {
 }
 
 pub fn start<S: State>() {
+    let _ = ThreadPoolBuilder::new().num_threads(8).build_global();
     let el = EventLoop::new().expect("Failed to create event loop");
 
     #[cfg(target_arch = "wasm32")]