Optimized cpu time for 3D point clouds (once again!)

crates/re_space_view_spatial/benches/bench_points.rs

@@ -133,18 +133,6 @@ fn bench_points(c: &mut criterion::Criterion) {
                 });
             }
 
-            {
-                let mut group = c.benchmark_group("Points3D");
-                group.throughput(criterion::Throughput::Elements(NUM_POINTS as _));
-                group.bench_function(bench_name(true, "load_positions"), |b| {
-                    b.iter(|| {
-                        let positions = LoadedPoints::load_positions(&data);
-                        assert_eq!(positions.len(), NUM_POINTS);
-                        positions
-                    });
-                });
-            }
-
             {
                 let points = LoadedPoints::load(&data, &ent_path, at, &annotations);
 
@@ -175,18 +163,6 @@ fn bench_points(c: &mut criterion::Criterion) {
                     });
                 });
             }
-
-            {
-                let mut group = c.benchmark_group("Points3D");
-                group.throughput(criterion::Throughput::Elements(NUM_POINTS as _));
-                group.bench_function(bench_name(true, "load_picking_ids"), |b| {
-                    b.iter(|| {
-                        let picking_ids = LoadedPoints::load_picking_ids(&data);
-                        assert_eq!(picking_ids.len(), NUM_POINTS);
-                        picking_ids
-                    });
-                });
-            }
         },
     )
     .unwrap();

crates/re_space_view_spatial/src/visualizers/points2d.rs

@@ -1,5 +1,5 @@
 use re_entity_db::{EntityPath, InstancePathHash};
-use re_renderer::{LineDrawableBuilder, PickingLayerInstanceId, PointCloudBuilder};
+use re_renderer::{LineDrawableBuilder, PointCloudBuilder};
 use re_types::{
     archetypes::Points2D,
     components::{ClassId, Color, InstanceKey, KeypointId, Position2D, Radius, Text},
@@ -95,7 +95,7 @@ impl Points2DVisualizer {
         let positions = Self::load_positions(data);
         let colors = Self::load_colors(data, ent_path, &annotation_infos);
         let radii = Self::load_radii(data, ent_path);
-        let picking_instance_ids = Self::load_picking_ids(data);
+        let picking_instance_ids = bytemuck::cast_slice(data.instance_keys);
 
         {
             re_tracing::profile_scope!("to_gpu");
@@ -112,7 +112,7 @@ impl Points2DVisualizer {
                 .picking_object_id(re_renderer::PickingLayerObjectId(ent_path.hash64()));
 
             let mut point_range_builder =
-                point_batch.add_points_2d(&positions, &radii, &colors, &picking_instance_ids);
+                point_batch.add_points_2d(&positions, &radii, &colors, picking_instance_ids);
 
             // Determine if there's any sub-ranges that need extra highlighting.
             {
@@ -200,14 +200,6 @@ impl Points2DVisualizer {
     ) -> Vec<re_renderer::Color32> {
         crate::visualizers::process_color_slice(colors, ent_path, annotation_infos)
     }
-
-    #[inline]
-    pub fn load_picking_ids(
-        &Points2DComponentData { instance_keys, .. }: &Points2DComponentData<'_>,
-    ) -> Vec<PickingLayerInstanceId> {
-        re_tracing::profile_function!();
-        bytemuck::cast_slice(instance_keys).to_vec()
-    }
 }
 
 // ---

crates/re_space_view_spatial/src/visualizers/points3d.rs

@@ -103,7 +103,7 @@ impl Points3DVisualizer {
                 .picking_object_id(re_renderer::PickingLayerObjectId(ent_path.hash64()));
 
             let mut point_range_builder =
-                point_batch.add_points(&positions, &radii, &colors, &picking_instance_ids);
+                point_batch.add_points(positions, &radii, &colors, picking_instance_ids);
 
             // Determine if there's any sub-ranges that need extra highlighting.
             {
@@ -151,7 +151,7 @@ impl Points3DVisualizer {
             if let Some(labels) = data.labels {
                 self.data.ui_labels.extend(Self::process_labels(
                     labels,
-                    &positions,
+                    positions,
                     &instance_path_hashes_for_picking,
                     &colors,
                     &annotation_infos,
@@ -275,13 +275,13 @@ impl VisualizerSystem for Points3DVisualizer {
 // ---
 
 #[doc(hidden)] // Public for benchmarks
-pub struct LoadedPoints {
+pub struct LoadedPoints<'a> {
     pub annotation_infos: ResolvedAnnotationInfos,
     pub keypoints: Keypoints,
-    pub positions: Vec<glam::Vec3>,
+    pub positions: &'a [glam::Vec3],
     pub radii: Vec<re_renderer::Size>,
     pub colors: Vec<re_renderer::Color32>,
-    pub picking_instance_ids: Vec<PickingLayerInstanceId>,
+    pub picking_instance_ids: &'a [PickingLayerInstanceId],
 }
 
 #[doc(hidden)] // Public for benchmarks
@@ -295,10 +295,10 @@ pub struct Points3DComponentData<'a> {
     pub class_ids: Option<&'a [Option<ClassId>]>,
 }
 
-impl LoadedPoints {
+impl<'a> LoadedPoints<'a> {
     #[inline]
     pub fn load(
-        data: &Points3DComponentData<'_>,
+        data: &'a Points3DComponentData<'_>,
         ent_path: &EntityPath,
         latest_at: TimeInt,
         annotations: &Annotations,
@@ -314,11 +314,12 @@ impl LoadedPoints {
             annotations,
         );
 
-        let (positions, radii, colors, picking_instance_ids) = join4(
-            || Self::load_positions(data),
+        let positions = bytemuck::cast_slice(data.positions);
+        let picking_instance_ids = bytemuck::cast_slice(data.instance_keys);
+
+        let (radii, colors) = rayon::join(
             || Self::load_radii(data, ent_path),
             || Self::load_colors(data, ent_path, &annotation_infos),
-            || Self::load_picking_ids(data),
         );
 
         Self {
@@ -331,14 +332,6 @@ impl LoadedPoints {
         }
     }
 
-    #[inline]
-    pub fn load_positions(
-        Points3DComponentData { positions, .. }: &Points3DComponentData<'_>,
-    ) -> Vec<glam::Vec3> {
-        re_tracing::profile_function!();
-        bytemuck::cast_slice(positions).to_vec()
-    }
-
     #[inline]
     pub fn load_radii(
         &Points3DComponentData {
@@ -357,32 +350,4 @@ impl LoadedPoints {
     ) -> Vec<re_renderer::Color32> {
         crate::visualizers::process_color_slice(colors, ent_path, annotation_infos)
     }
-
-    #[inline]
-    pub fn load_picking_ids(
-        &Points3DComponentData { instance_keys, .. }: &Points3DComponentData<'_>,
-    ) -> Vec<PickingLayerInstanceId> {
-        re_tracing::profile_function!();
-        bytemuck::cast_slice(instance_keys).to_vec()
-    }
-}
-
-/// Run 4 things in parallel
-fn join4<A: Send, B: Send, C: Send, D: Send>(
-    a: impl FnOnce() -> A + Send,
-    b: impl FnOnce() -> B + Send,
-    c: impl FnOnce() -> C + Send,
-    d: impl FnOnce() -> D + Send,
-) -> (A, B, C, D) {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        re_tracing::profile_function!();
-        let ((a, b), (c, d)) = rayon::join(|| rayon::join(a, b), || rayon::join(c, d));
-        (a, b, c, d)
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    {
-        (a(), b(), c(), d())
-    }
 }