[Merged by Bors] - Parallel Frustum Culling

crates/bevy_render/Cargo.toml

@@ -28,34 +28,44 @@ webgl = ["wgpu/webgl"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
-bevy_asset = { path = "../bevy_asset", version = "0.8.0-dev" }
-bevy_core = { path = "../bevy_core", version = "0.8.0-dev" }
-bevy_derive = { path = "../bevy_derive", version = "0.8.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" }
-bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.8.0-dev" }
-bevy_math = { path = "../bevy_math", version = "0.8.0-dev" }
-bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.8.0-dev" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev", features = ["bevy"] }
-bevy_render_macros = { path = "macros", version = "0.8.0-dev" }
-bevy_transform = { path = "../bevy_transform", version = "0.8.0-dev" }
-bevy_window = { path = "../bevy_window", version = "0.8.0-dev" }
-bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
+bevy_app = { path = "../bevy_app", version = "0.7.0" }
+bevy_asset = { path = "../bevy_asset", version = "0.7.0" }
+bevy_core = { path = "../bevy_core", version = "0.7.0" }
+bevy_crevice = { path = "../bevy_crevice", version = "0.7.0", features = [
+    "glam",
+] }
+bevy_derive = { path = "../bevy_derive", version = "0.7.0" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.7.0" }
+bevy_math = { path = "../bevy_math", version = "0.7.0" }
+bevy_reflect = { path = "../bevy_reflect", version = "0.7.0", features = [
+    "bevy",
+] }
+bevy_tasks = { path = "../bevy_tasks", version = "0.7.0" }
+bevy_transform = { path = "../bevy_transform", version = "0.7.0" }
+bevy_window = { path = "../bevy_window", version = "0.7.0" }
+bevy_utils = { path = "../bevy_utils", version = "0.7.0" }
 
 # rendering
 image = { version = "0.24", default-features = false }
 
 # misc
 wgpu = { version = "0.12.0", features = ["spirv"] }
 codespan-reporting = "0.11.0"
-naga = { version = "0.8.0", features = ["glsl-in", "spv-in", "spv-out", "wgsl-in", "wgsl-out"] }
+naga = { version = "0.8.0", features = [
+    "glsl-in",
+    "spv-in",
+    "spv-out",
+    "wgsl-in",
+    "wgsl-out",
+] }
 serde = { version = "1", features = ["derive"] }
 bitflags = "1.2.1"
 smallvec = { version = "1.6", features = ["union", "const_generics"] }
 once_cell = "1.4.1" # TODO: replace once_cell with std equivalent if/when this lands: https://github.com/rust-lang/rfcs/pull/2788
 downcast-rs = "1.2.0"
 thiserror = "1.0"
 futures-lite = "1.4.0"
+crossbeam-channel = "0.5.0"
 anyhow = "1.0"
 hex = "0.4.2"
 hexasphere = "7.0.0"

crates/bevy_render/src/view/visibility/mod.rs

@@ -1,12 +1,10 @@
 mod render_layers;
-
-use bevy_math::Vec3A;
 pub use render_layers::*;
 
 use bevy_app::{CoreStage, Plugin};
 use bevy_asset::{Assets, Handle};
 use bevy_ecs::prelude::*;
-use bevy_reflect::std_traits::ReflectDefault;
+use bevy_math::Vec3A;
 use bevy_reflect::Reflect;
 use bevy_transform::components::GlobalTransform;
 use bevy_transform::TransformSystem;
@@ -148,72 +146,68 @@ pub fn update_frusta<T: Component + CameraProjection + Send + Sync + 'static>(
 }
 
 pub fn check_visibility(
+    thread_pool: Res<bevy_tasks::prelude::ComputeTaskPool>,
     mut view_query: Query<(&mut VisibleEntities, &Frustum, Option<&RenderLayers>), With<Camera>>,
-    mut visible_entity_query: ParamSet<(
-        Query<&mut ComputedVisibility>,
-        Query<(
-            Entity,
-            &Visibility,
-            &mut ComputedVisibility,
-            Option<&RenderLayers>,
-            Option<&Aabb>,
-            Option<&NoFrustumCulling>,
-            Option<&GlobalTransform>,
-        )>,
+    mut visible_entity_query: Query<(
+        Entity,
+        &Visibility,
+        &mut ComputedVisibility,
+        Option<&RenderLayers>,
+        Option<&Aabb>,
+        Option<&NoFrustumCulling>,
+        Option<&GlobalTransform>,
     )>,
 ) {
-    // Reset the computed visibility to false
-    for mut computed_visibility in visible_entity_query.p0().iter_mut() {
-        computed_visibility.is_visible = false;
-    }
-
     for (mut visible_entities, frustum, maybe_view_mask) in view_query.iter_mut() {
-        visible_entities.entities.clear();
         let view_mask = maybe_view_mask.copied().unwrap_or_default();
-
-        for (
-            entity,
-            visibility,
-            mut computed_visibility,
-            maybe_entity_mask,
-            maybe_aabb,
-            maybe_no_frustum_culling,
-            maybe_transform,
-        ) in visible_entity_query.p1().iter_mut()
-        {
-            if !visibility.is_visible {
-                continue;
-            }
-
-            let entity_mask = maybe_entity_mask.copied().unwrap_or_default();
-            if !view_mask.intersects(&entity_mask) {
-                continue;
-            }
-
-            // If we have an aabb and transform, do frustum culling
-            if let (Some(model_aabb), None, Some(transform)) =
-                (maybe_aabb, maybe_no_frustum_culling, maybe_transform)
-            {
-                let model = transform.compute_matrix();
-                let model_sphere = Sphere {
-                    center: model.transform_point3a(model_aabb.center),
-                    radius: (Vec3A::from(transform.scale) * model_aabb.half_extents).length(),
-                };
-                // Do quick sphere-based frustum culling
-                if !frustum.intersects_sphere(&model_sphere, false) {
-                    continue;
+        let (visible_entity_sender, visible_entity_receiver) = crossbeam_channel::unbounded();
+
+        visible_entity_query.par_for_each_mut(
+            &thread_pool,
+            1024,
+            |(
+                entity,
+                visibility,
+                mut computed_visibility,
+                maybe_entity_mask,
+                maybe_aabb,
+                maybe_no_frustum_culling,
+                maybe_transform,
+            )| {
+                // Reset visibility
+                computed_visibility.is_visible = false;
+
+                if !visibility.is_visible {
+                    return;
                 }
-                // If we have an aabb, do aabb-based frustum culling
-                if !frustum.intersects_obb(model_aabb, &model, false) {
-                    continue;
+                let entity_mask = maybe_entity_mask.copied().unwrap_or_default();
+                if !view_mask.intersects(&entity_mask) {
+                    return;
                 }
-            }
 
-            computed_visibility.is_visible = true;
-            visible_entities.entities.push(entity);
-        }
+                // If we have an aabb and transform, do frustum culling
+                if let (Some(model_aabb), None, Some(transform)) =
+                    (maybe_aabb, maybe_no_frustum_culling, maybe_transform)
+                {
+                    let model = transform.compute_matrix();
+                    let model_sphere = Sphere {
+                        center: model.transform_point3a(model_aabb.center),
+                        radius: (Vec3A::from(transform.scale) * model_aabb.half_extents).length(),
+                    };
+                    // Do quick sphere-based frustum culling
+                    if !frustum.intersects_sphere(&model_sphere, false) {
+                        return;
+                    }
+                    // If we have an aabb, do aabb-based frustum culling
+                    if !frustum.intersects_obb(model_aabb, &model, false) {
+                        return;
+                    }
+                }
 
-        // TODO: check for big changes in visible entities len() vs capacity() (ex: 2x) and resize
-        // to prevent holding unneeded memory
+                computed_visibility.is_visible = true;
+                visible_entity_sender.send(entity).ok();
+            },
+        );
+        visible_entities.entities = visible_entity_receiver.try_iter().collect();
     }
 }