Opt-in-Per-Camera Pointlight and Spotlight Shadow Maps

crates/bevy_camera/src/camera.rs

@@ -410,6 +410,17 @@ pub struct Camera {
     pub invert_culling: bool,
     /// If set, this camera will be a sub camera of a large view, defined by a [`SubCameraView`].
     pub sub_camera_view: Option<SubCameraView>,
+    /// Whether this camera will generate its own shadow maps for any lights in the scene.
+    ///
+    /// If true, shadow maps unique to this camera will be generated.
+    /// The shadow maps will be generated using the same render layers and HLOD configuration as this camera.
+    /// The light's render layers **must** be a superset of this camera's render layers in order for this to work properly.
+    ///
+    /// Enabling this setting can have a negative impact on performance. Point lights in particular
+    /// will generate 6 additional shadow maps per camera that opts to have its own shadow maps.
+    ///
+    /// Defaults to `false`.
+    pub has_own_shadow_maps: bool,
 }
 
 impl Default for Camera {
@@ -424,6 +435,7 @@ impl Default for Camera {
             clear_color: Default::default(),
             invert_culling: false,
             sub_camera_view: None,
+            has_own_shadow_maps: false,
         }
     }
 }

crates/bevy_pbr/src/render/gpu_preprocess.rs

@@ -72,7 +72,10 @@ use bitflags::bitflags;
 use smallvec::{smallvec, SmallVec};
 use tracing::warn;
 
-use crate::{LightEntity, MeshCullingData, MeshCullingDataBuffer, MeshInputUniform, MeshUniform};
+use crate::{
+    LightEntity, MeshCullingData, MeshCullingDataBuffer, MeshInputUniform, MeshUniform,
+    PointLightShadowViewEntities, SpotLightShadowViewEntity,
+};
 
 use super::{ShadowView, ViewLightEntities};
 
@@ -524,7 +527,14 @@ pub fn clear_indirect_parameters_metadata(
 /// to frame, we avoid having to perform a CPU-side traversal of every mesh
 /// instance every frame.
 pub fn unpack_bins(
-    current_view: ViewQuery<Option<&ViewLightEntities>, Without<SkipGpuPreprocess>>,
+    current_view: ViewQuery<
+        (
+            Option<&ViewLightEntities>,
+            Option<&PointLightShadowViewEntities>,
+            Option<&SpotLightShadowViewEntity>,
+        ),
+        Without<SkipGpuPreprocess>,
+    >,
     view_query: Query<&ExtractedView, Without<SkipGpuPreprocess>>,
     light_query: Query<&LightEntity>,
     batched_instance_buffers: Res<BatchedInstanceBuffers<MeshUniform, MeshInputUniform>>,
@@ -546,9 +556,15 @@ pub fn unpack_bins(
 
     // Gather up all views.
     let view_entity = current_view.entity();
-    let shadow_cascade_views = current_view.into_inner();
-    let all_views =
-        gather_shadow_cascades_for_view(view_entity, shadow_cascade_views, &light_query);
+    let (shadow_cascade_views, point_light_shadow_views, spot_light_shadow_view) =
+        current_view.into_inner();
+    let all_views = gather_shadow_cascades_for_view(
+        view_entity,
+        shadow_cascade_views,
+        point_light_shadow_views,
+        spot_light_shadow_view,
+        &light_query,
+    );
 
     // Don't run if the shaders haven't been compiled yet.
     if let Some(bin_unpacking_pipeline_id) = preprocess_pipelines.bin_unpacking.pipeline_id
@@ -600,7 +616,14 @@ pub fn unpack_bins(
 }
 
 pub fn early_gpu_preprocess(
-    current_view: ViewQuery<Option<&ViewLightEntities>, Without<SkipGpuPreprocess>>,
+    current_view: ViewQuery<
+        (
+            Option<&ViewLightEntities>,
+            Option<&PointLightShadowViewEntities>,
+            Option<&SpotLightShadowViewEntity>,
+        ),
+        Without<SkipGpuPreprocess>,
+    >,
     view_query: Query<
         (
             &ExtractedView,
@@ -630,9 +653,15 @@ pub fn early_gpu_preprocess(
     let pass_span = diagnostics.pass_span(&mut compute_pass, "early_mesh_preprocessing");
 
     let view_entity = current_view.entity();
-    let shadow_cascade_views = current_view.into_inner();
-    let all_views =
-        gather_shadow_cascades_for_view(view_entity, shadow_cascade_views, &light_query);
+    let (shadow_cascade_views, point_light_shadow_views, spot_light_shadow_view) =
+        current_view.into_inner();
+    let all_views = gather_shadow_cascades_for_view(
+        view_entity,
+        shadow_cascade_views,
+        point_light_shadow_views,
+        spot_light_shadow_view,
+        &light_query,
+    );
 
     // Run the compute passes.
     for view_entity in all_views {
@@ -795,6 +824,8 @@ pub fn early_gpu_preprocess(
 fn gather_shadow_cascades_for_view(
     view_entity: Entity,
     shadow_cascade_views: Option<&ViewLightEntities>,
+    point_light_shadow_views: Option<&PointLightShadowViewEntities>,
+    spot_light_shadow_view: Option<&SpotLightShadowViewEntity>,
     light_query: &Query<&LightEntity>,
 ) -> SmallVec<[Entity; 8]> {
     let mut all_views: SmallVec<[_; 8]> = SmallVec::new();
@@ -812,6 +843,26 @@ fn gather_shadow_cascades_for_view(
                 .copied(),
         );
     }
+    if let Some(point_light_shadow_views) = point_light_shadow_views {
+        all_views.extend(
+            point_light_shadow_views
+                .shadow_view_entities
+                .iter()
+                .filter(|light_entity| {
+                    light_query.get(**light_entity).is_ok_and(|light_entity| {
+                        matches!(*light_entity, LightEntity::Point { .. })
+                    })
+                })
+                .copied(),
+        );
+    }
+    if let Some(spot_light_shadow_view) = spot_light_shadow_view
+        && light_query
+            .get(spot_light_shadow_view.shadow_view_entity)
+            .is_ok_and(|light_entity| matches!(*light_entity, LightEntity::Spot { .. }))
+    {
+        all_views.push(spot_light_shadow_view.shadow_view_entity);
+    }
     all_views
 }