Unvendor lru-slab

client/Cargo.toml

@@ -39,6 +39,7 @@ gltf = { version = "1.0.0", default-features = false, features = ["utils"] }
 metrics = "0.24.0"
 hdrhistogram = { version = "7", default-features = false }
 save = { path = "../save" }
+lru-slab = "0.1.2"
 
 [features]
 default = ["use-repo-assets"]

client/src/graphics/voxels/mod.rs

@@ -7,6 +7,7 @@ mod tests;
 use std::{sync::Arc, time::Instant};
 
 use ash::{Device, vk};
+use lru_slab::LruSlab;
 use metrics::histogram;
 use tracing::warn;
 
@@ -15,10 +16,8 @@ use crate::{
     graphics::{Base, Frustum},
 };
 use common::{
-    LruSlab,
     dodeca::{self, Vertex},
     graph::NodeId,
-    lru_slab::SlotId,
     math::{MIsometry, MPoint},
     node::{Chunk, ChunkId, VoxelData},
 };
@@ -135,7 +134,7 @@ impl Voxels {
                     self.states.get_mut(slot).refcount += 1;
                     frame.drawn.push(slot);
                     // Transfer transform
-                    frame.surface.transforms_mut()[slot.0 as usize] =
+                    frame.surface.transforms_mut()[slot as usize] =
                         na::Matrix4::from(*node_transform) * vertex.chunk_to_node();
                 }
                 if let (None, &VoxelData::Dense(ref data)) = (&surface, voxels) {
@@ -183,9 +182,9 @@ impl Voxels {
                     let node_is_odd = sim.graph.depth(node) & 1 != 0;
                     extractions.push(ExtractTask {
                         index: scratch_slot,
-                        indirect_offset: self.surfaces.indirect_offset(slot.0),
-                        face_offset: self.surfaces.face_offset(slot.0),
-                        draw_id: slot.0,
+                        indirect_offset: self.surfaces.indirect_offset(slot),
+                        face_offset: self.surfaces.face_offset(slot),
+                        draw_id: slot,
                         reverse_winding: vertex.parity() ^ node_is_odd,
                     });
                 }
@@ -224,8 +223,8 @@ impl Voxels {
             ) {
                 return;
             }
-            for chunk in &frame.drawn {
-                self.draw.draw(device, cmd, &self.surfaces, chunk.0);
+            for &chunk in &frame.drawn {
+                self.draw.draw(device, cmd, &self.surfaces, chunk);
             }
             histogram!("frame.cpu.voxels.draw").record(started.elapsed());
         }
@@ -245,7 +244,7 @@ pub struct Frame {
     surface: surface::Frame,
     /// Scratch slots completed in this frame
     extracted: Vec<u32>,
-    drawn: Vec<SlotId>,
+    drawn: Vec<u32>,
 }
 
 impl Frame {

common/src/lib.rs

@@ -21,7 +21,6 @@ pub mod graph;
 pub mod graph_collision;
 mod graph_entities;
 pub mod graph_ray_casting;
-pub mod lru_slab;
 mod margins;
 pub mod math;
 pub mod node;
@@ -35,7 +34,6 @@ pub mod worldgen;
 
 pub use chunks::Chunks;
 pub use graph_entities::GraphEntities;
-pub use lru_slab::LruSlab;
 pub use sim_config::{SimConfig, SimConfigRaw};
 
 // Stable IDs made of 8 random bytes for easy persistent references