Make most bevy_render RenderApp access panic instead of doing nothing.

andriyDev · andriyDev · commit 9862f7592248 · 2025-06-28T23:16:37.000-07:00
diff --git a/crates/bevy_render/src/batching/gpu_preprocessing.rs b/crates/bevy_render/src/batching/gpu_preprocessing.rs
@@ -49,9 +49,9 @@ pub struct BatchingPlugin {
 
 impl Plugin for BatchingPlugin {
     fn build(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .insert_resource(IndirectParametersBuffers::new(
@@ -69,9 +69,9 @@ impl Plugin for BatchingPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<GpuPreprocessingSupport>();
     }
diff --git a/crates/bevy_render/src/camera/mod.rs b/crates/bevy_render/src/camera/mod.rs
@@ -39,14 +39,15 @@ impl Plugin for CameraPlugin {
                 ExtractComponentPlugin::<CameraMainTextureUsages>::default(),
             ));
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<SortedCameras>()
-                .add_systems(ExtractSchedule, extract_cameras)
-                .add_systems(Render, sort_cameras.in_set(RenderSystems::ManageViews));
-            let camera_driver_node = CameraDriverNode::new(render_app.world_mut());
-            let mut render_graph = render_app.world_mut().resource_mut::<RenderGraph>();
-            render_graph.add_node(crate::graph::CameraDriverLabel, camera_driver_node);
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .init_resource::<SortedCameras>()
+            .add_systems(ExtractSchedule, extract_cameras)
+            .add_systems(Render, sort_cameras.in_set(RenderSystems::ManageViews));
+        let camera_driver_node = CameraDriverNode::new(render_app.world_mut());
+        let mut render_graph = render_app.world_mut().resource_mut::<RenderGraph>();
+        render_graph.add_node(crate::graph::CameraDriverLabel, camera_driver_node);
     }
 }
diff --git a/crates/bevy_render/src/diagnostic/mod.rs b/crates/bevy_render/src/diagnostic/mod.rs
@@ -54,15 +54,16 @@ impl Plugin for RenderDiagnosticsPlugin {
         app.insert_resource(render_diagnostics_mutex.clone())
             .add_systems(PreUpdate, sync_diagnostics);
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.insert_resource(render_diagnostics_mutex);
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.insert_resource(render_diagnostics_mutex);
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         let adapter_info = render_app.world().resource::<RenderAdapterInfo>();
         let device = render_app.world().resource::<RenderDevice>();
diff --git a/crates/bevy_render/src/erased_render_asset.rs b/crates/bevy_render/src/erased_render_asset.rs
@@ -125,20 +125,21 @@ impl<A: ErasedRenderAsset, AFTER: ErasedRenderAssetDependency + 'static> Plugin
     }
 
     fn finish(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<ExtractedAssets<A>>()
-                .init_resource::<ErasedRenderAssets<A::ErasedAsset>>()
-                .init_resource::<PrepareNextFrameAssets<A>>()
-                .add_systems(
-                    ExtractSchedule,
-                    extract_erased_render_asset::<A>.in_set(AssetExtractionSystems),
-                );
-            AFTER::register_system(
-                render_app,
-                prepare_erased_assets::<A>.in_set(RenderSystems::PrepareAssets),
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .init_resource::<ExtractedAssets<A>>()
+            .init_resource::<ErasedRenderAssets<A::ErasedAsset>>()
+            .init_resource::<PrepareNextFrameAssets<A>>()
+            .add_systems(
+                ExtractSchedule,
+                extract_erased_render_asset::<A>.in_set(AssetExtractionSystems),
             );
-        }
+        AFTER::register_system(
+            render_app,
+            prepare_erased_assets::<A>.in_set(RenderSystems::PrepareAssets),
+        );
     }
 }
 
diff --git a/crates/bevy_render/src/extract_component.rs b/crates/bevy_render/src/extract_component.rs
@@ -82,14 +82,15 @@ impl<C> Default for UniformComponentPlugin<C> {
 
 impl<C: Component + ShaderType + WriteInto + Clone> Plugin for UniformComponentPlugin<C> {
     fn build(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .insert_resource(ComponentUniforms::<C>::default())
-                .add_systems(
-                    Render,
-                    prepare_uniform_components::<C>.in_set(RenderSystems::PrepareResources),
-                );
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .insert_resource(ComponentUniforms::<C>::default())
+            .add_systems(
+                Render,
+                prepare_uniform_components::<C>.in_set(RenderSystems::PrepareResources),
+            );
     }
 }
 
@@ -187,12 +188,13 @@ impl<C: ExtractComponent> Plugin for ExtractComponentPlugin<C> {
     fn build(&self, app: &mut App) {
         app.add_plugins(SyncComponentPlugin::<C>::default());
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            if self.only_extract_visible {
-                render_app.add_systems(ExtractSchedule, extract_visible_components::<C>);
-            } else {
-                render_app.add_systems(ExtractSchedule, extract_components::<C>);
-            }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        if self.only_extract_visible {
+            render_app.add_systems(ExtractSchedule, extract_visible_components::<C>);
+        } else {
+            render_app.add_systems(ExtractSchedule, extract_components::<C>);
         }
     }
 }
diff --git a/crates/bevy_render/src/extract_instances.rs b/crates/bevy_render/src/extract_instances.rs
@@ -94,13 +94,14 @@ where
     EI: ExtractInstance,
 {
     fn build(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.init_resource::<ExtractedInstances<EI>>();
-            if self.only_extract_visible {
-                render_app.add_systems(ExtractSchedule, extract_visible::<EI>);
-            } else {
-                render_app.add_systems(ExtractSchedule, extract_all::<EI>);
-            }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.init_resource::<ExtractedInstances<EI>>();
+        if self.only_extract_visible {
+            render_app.add_systems(ExtractSchedule, extract_visible::<EI>);
+        } else {
+            render_app.add_systems(ExtractSchedule, extract_all::<EI>);
         }
     }
 }
diff --git a/crates/bevy_render/src/globals.rs b/crates/bevy_render/src/globals.rs
@@ -18,16 +18,17 @@ impl Plugin for GlobalsPlugin {
         load_shader_library!(app, "globals.wgsl");
         app.register_type::<GlobalsUniform>();
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<GlobalsBuffer>()
-                .init_resource::<Time>()
-                .add_systems(ExtractSchedule, (extract_frame_count, extract_time))
-                .add_systems(
-                    Render,
-                    prepare_globals_buffer.in_set(RenderSystems::PrepareResources),
-                );
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .init_resource::<GlobalsBuffer>()
+            .init_resource::<Time>()
+            .add_systems(ExtractSchedule, (extract_frame_count, extract_time))
+            .add_systems(
+                Render,
+                prepare_globals_buffer.in_set(RenderSystems::PrepareResources),
+            );
     }
 }
 
diff --git a/crates/bevy_render/src/gpu_component_array_buffer.rs b/crates/bevy_render/src/gpu_component_array_buffer.rs
@@ -17,20 +17,22 @@ pub struct GpuComponentArrayBufferPlugin<C: Component + GpuArrayBufferable>(Phan
 
 impl<C: Component + GpuArrayBufferable> Plugin for GpuComponentArrayBufferPlugin<C> {
     fn build(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.add_systems(
-                Render,
-                prepare_gpu_component_array_buffers::<C>.in_set(RenderSystems::PrepareResources),
-            );
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.add_systems(
+            Render,
+            prepare_gpu_component_array_buffers::<C>.in_set(RenderSystems::PrepareResources),
+        );
     }
 
     fn finish(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.insert_resource(GpuArrayBuffer::<C>::new(
-                render_app.world().resource::<RenderDevice>(),
-            ));
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.insert_resource(GpuArrayBuffer::<C>::new(
+            render_app.world().resource::<RenderDevice>(),
+        ));
     }
 }
 
diff --git a/crates/bevy_render/src/gpu_readback.rs b/crates/bevy_render/src/gpu_readback.rs
@@ -51,22 +51,23 @@ impl Plugin for GpuReadbackPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(ExtractComponentPlugin::<Readback>::default());
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<GpuReadbackBufferPool>()
-                .init_resource::<GpuReadbacks>()
-                .insert_resource(GpuReadbackMaxUnusedFrames(self.max_unused_frames))
-                .add_systems(ExtractSchedule, sync_readbacks.ambiguous_with_all())
-                .add_systems(
-                    Render,
-                    (
-                        prepare_buffers.in_set(RenderSystems::PrepareResources),
-                        map_buffers
-                            .after(render_system)
-                            .in_set(RenderSystems::Render),
-                    ),
-                );
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .init_resource::<GpuReadbackBufferPool>()
+            .init_resource::<GpuReadbacks>()
+            .insert_resource(GpuReadbackMaxUnusedFrames(self.max_unused_frames))
+            .add_systems(ExtractSchedule, sync_readbacks.ambiguous_with_all())
+            .add_systems(
+                Render,
+                (
+                    prepare_buffers.in_set(RenderSystems::PrepareResources),
+                    map_buffers
+                        .after(render_system)
+                        .in_set(RenderSystems::Render),
+                ),
+            );
     }
 }
 
diff --git a/crates/bevy_render/src/mesh/allocator.rs b/crates/bevy_render/src/mesh/allocator.rs
@@ -309,9 +309,9 @@ impl Display for SlabId {
 
 impl Plugin for MeshAllocatorPlugin {
     fn build(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<MeshAllocatorSettings>()
@@ -324,9 +324,9 @@ impl Plugin for MeshAllocatorPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         // The `RenderAdapter` isn't available until now, so we can't do this in
         // [`Plugin::build`].
diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs
@@ -76,9 +76,9 @@ impl Plugin for MeshPlugin {
                     .before(AssetEventSystems),
             );
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<MeshVertexBufferLayouts>();
     }
diff --git a/crates/bevy_render/src/render_asset.rs b/crates/bevy_render/src/render_asset.rs
@@ -118,20 +118,21 @@ impl<A: RenderAsset, AFTER: RenderAssetDependency + 'static> Plugin
 {
     fn build(&self, app: &mut App) {
         app.init_resource::<CachedExtractRenderAssetSystemState<A>>();
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<ExtractedAssets<A>>()
-                .init_resource::<RenderAssets<A>>()
-                .init_resource::<PrepareNextFrameAssets<A>>()
-                .add_systems(
-                    ExtractSchedule,
-                    extract_render_asset::<A>.in_set(AssetExtractionSystems),
-                );
-            AFTER::register_system(
-                render_app,
-                prepare_assets::<A>.in_set(RenderSystems::PrepareAssets),
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app
+            .init_resource::<ExtractedAssets<A>>()
+            .init_resource::<RenderAssets<A>>()
+            .init_resource::<PrepareNextFrameAssets<A>>()
+            .add_systems(
+                ExtractSchedule,
+                extract_render_asset::<A>.in_set(AssetExtractionSystems),
             );
-        }
+        AFTER::register_system(
+            render_app,
+            prepare_assets::<A>.in_set(RenderSystems::PrepareAssets),
+        );
     }
 }
 
diff --git a/crates/bevy_render/src/render_phase/mod.rs b/crates/bevy_render/src/render_phase/mod.rs
@@ -1149,9 +1149,9 @@ where
     GFBD: GetFullBatchData + Sync + Send + 'static,
 {
     fn build(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<ViewBinnedRenderPhases<BPI>>()
@@ -1255,9 +1255,9 @@ where
     GFBD: GetFullBatchData + Sync + Send + 'static,
 {
     fn build(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<ViewSortedRenderPhases<SPI>>()
diff --git a/crates/bevy_render/src/texture/mod.rs b/crates/bevy_render/src/texture/mod.rs
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
diff --git a/crates/bevy_render/src/view/visibility/range.rs b/crates/bevy_render/src/view/visibility/range.rs
diff --git a/crates/bevy_render/src/view/window/mod.rs b/crates/bevy_render/src/view/window/mod.rs
diff --git a/crates/bevy_render/src/view/window/screenshot.rs b/crates/bevy_render/src/view/window/screenshot.rs

Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,14 @@ where`
`94`	`94`	`EI: ExtractInstance,`
`95`	`95`	`{`
`96`	`96`	`fn build(&self, app: &mut App) {`
`97`		`- if let Some(render_app) = app.get_sub_app_mut(RenderApp) {`
`98`		`- render_app.init_resource::<ExtractedInstances<EI>>();`
`99`		`- if self.only_extract_visible {`
`100`		`- render_app.add_systems(ExtractSchedule, extract_visible::<EI>);`
`101`		`- } else {`
`102`		`- render_app.add_systems(ExtractSchedule, extract_all::<EI>);`
`103`		`- }`
	`97`	`+ let render_app = app`
	`98`	`+ .get_sub_app_mut(RenderApp)`
	`99`	`+ .expect("RenderPlugin has not been added");`
	`100`	`+ render_app.init_resource::<ExtractedInstances<EI>>();`
	`101`	`+ if self.only_extract_visible {`
	`102`	`+ render_app.add_systems(ExtractSchedule, extract_visible::<EI>);`
	`103`	`+ } else {`
	`104`	`+ render_app.add_systems(ExtractSchedule, extract_all::<EI>);`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`	`}`