fix: use weak ref slab (#135)

* chore: bumped rust-gpu

* consolidate drawing into new draw module, use weak refs for renderlets internally

* fixes after weak ref work

* revert back to spirv-builder v0.9.1 and regen shaders

* track rust-gpu main

Author: schell

Cargo.lock

@@ -17,7 +17,7 @@ resolver = "2"
 assert_approx_eq = "1.1.0"
 async-channel = "1.8"
 bytemuck = { version = "1.13.0", features = ["derive"] }
-crabslab = { version = "0.5.1", default-features = false }
+crabslab = { version = "0.6.0", default-features = false }
 ctor = "0.2.2"
 dagga = "0.2.1"
 env_logger = "0.10.0"

Cargo.toml

@@ -202,10 +202,7 @@ impl TestAppHandler for CullingExample {
     ) -> Self {
         let mut seed = 46;
         let mut resources = BagOfResources::default();
-        let stage = ctx
-            .new_stage()
-            .with_lighting(true)
-            .with_compute_culling(false);
+        let stage = ctx.new_stage().with_lighting(true);
         let sunlight_a = stage.new_value(DirectionalLight {
             direction: Vec3::new(-0.8, -1.0, 0.5).normalize(),
             color: Vec4::ONE,

crates/example-culling/src/main.rs

@@ -34,7 +34,7 @@ use renderling::{
     atlas::AtlasTexture,
     camera::Camera,
     math::{Quat, UVec2, Vec2, Vec3Swizzles, Vec4},
-    slab::{Hybrid, UpdatesSlab},
+    slab::Hybrid,
     stage::{NestedTransform, Renderlet, Stage},
     transform::Transform,
     Context,
@@ -146,6 +146,9 @@ pub struct Ui {
     // We keep a list of transforms that we use to "manually" order renderlets.
     //
     // This is required because interface elements have transparency.
+    //
+    // The `usize` key here is the update source notifier index, which is needed
+    // to re-order after any transform performs an update.
     transforms: Arc<RwLock<FxHashMap<usize, UiTransform>>>,
     default_stroke_options: Arc<RwLock<StrokeOptions>>,
     default_fill_options: Arc<RwLock<FillOptions>>,
@@ -240,7 +243,7 @@ impl Ui {
         self.transforms
             .write()
             .unwrap()
-            .insert(transform.transform.id(), transform.clone());
+            .insert(transform.transform.get_notifier_index(), transform.clone());
         transform
     }
 

crates/renderling-ui/src/lib.rs

@@ -15,7 +15,7 @@ readme = "../../README.md"
 crate-type = ["rlib", "cdylib"]
 
 [features]
-default = ["gltf", "sdf", "shaders", "tutorial", "winit"]
+default = ["gltf", "shaders", "tutorial", "winit"]
 shaders = [
   "array_test",
   "bloom",
@@ -37,7 +37,6 @@ shaders = [
   "tonemapping_vertex"
 ]
 gltf = ["dep:gltf", "dep:serde_json"]
-sdf = []
 tutorial = [
   "tutorial_passthru_fragment",
   "tutorial_implicit_isosceles_vertex",
@@ -88,9 +87,12 @@ tutorial_slabbed_renderlet = []
 
 wasm = ["wgpu/fragile-send-sync-non-atomic-wasm"]
 
+[patch.crates-io]
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu" }
+
 # dependencies for CPU and GPU code
 [dependencies]
-spirv-std = "0.9"
+spirv-std = { version = "0.9" }
 
 # dependencies for GPU code
 [target.'cfg(target_arch = "spirv")'.dependencies]