Initialize SpritePipeline in a system in RenderStartup.

crates/bevy_sprite/src/lib.rs

@@ -56,7 +56,7 @@ use bevy_render::{
     render_phase::AddRenderCommand,
     render_resource::SpecializedRenderPipelines,
     view::{NoFrustumCulling, VisibilitySystems},
-    ExtractSchedule, Render, RenderApp, RenderSystems,
+    ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
 };
 
 /// Adds support for 2D sprite rendering.
@@ -118,7 +118,9 @@ impl Plugin for SpritePlugin {
                 .init_resource::<ExtractedSprites>()
                 .init_resource::<ExtractedSlices>()
                 .init_resource::<SpriteAssetEvents>()
+                .init_resource::<SpriteBatches>()
                 .add_render_command::<Transparent2d, DrawSprite>()
+                .add_systems(RenderStartup, init_sprite_pipeline)
                 .add_systems(
                     ExtractSchedule,
                     (
@@ -140,14 +142,6 @@ impl Plugin for SpritePlugin {
                 );
         };
     }
-
-    fn finish(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app
-                .init_resource::<SpriteBatches>()
-                .init_resource::<SpritePipeline>();
-        }
-    }
 }
 
 /// System calculating and inserting an [`Aabb`] component to entities with either:

crates/bevy_sprite/src/render/mod.rs

@@ -1,7 +1,7 @@
 use core::ops::Range;
 
 use crate::{Anchor, ComputedTextureSlices, ScalingMode, Sprite};
-use bevy_asset::{load_embedded_asset, AssetEvent, AssetId, Assets, Handle};
+use bevy_asset::{load_embedded_asset, AssetEvent, AssetId, AssetServer, Assets, Handle};
 use bevy_color::{ColorToComponents, LinearRgba};
 use bevy_core_pipeline::{
     core_2d::{Transparent2d, CORE_2D_DEPTH_FORMAT},
@@ -14,7 +14,7 @@ use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
     prelude::*,
     query::ROQueryItem,
-    system::{lifetimeless::*, SystemParamItem, SystemState},
+    system::{lifetimeless::*, SystemParamItem},
 };
 use bevy_image::{BevyDefault, Image, ImageSampler, TextureAtlasLayout, TextureFormatPixelInfo};
 use bevy_math::{Affine3A, FloatOrd, Quat, Rect, Vec2, Vec4};
@@ -52,15 +52,13 @@ pub struct SpritePipeline {
     pub dummy_white_gpu_image: GpuImage,
 }
 
-impl FromWorld for SpritePipeline {
-    fn from_world(world: &mut World) -> Self {
-        let mut system_state: SystemState<(
-            Res<RenderDevice>,
-            Res<DefaultImageSampler>,
-            Res<RenderQueue>,
-        )> = SystemState::new(world);
-        let (render_device, default_sampler, render_queue) = system_state.get_mut(world);
-
+pub fn init_sprite_pipeline(
+    mut commands: Commands,
+    render_device: Res<RenderDevice>,
+    default_sampler: Res<DefaultImageSampler>,
+    render_queue: Res<RenderQueue>,
+    asset_server: Res<AssetServer>,
+) {
     let tonemapping_lut_entries = get_lut_bind_group_layout_entries();
     let view_layout = render_device.create_bind_group_layout(
         "sprite_view_layout",
@@ -116,13 +114,12 @@ impl FromWorld for SpritePipeline {
         }
     };
 
-        SpritePipeline {
+    commands.insert_resource(SpritePipeline {
         view_layout,
         material_layout,
         dummy_white_gpu_image,
-            shader: load_embedded_asset!(world, "sprite.wgsl"),
-        }
-    }
+        shader: load_embedded_asset!(asset_server.as_ref(), "sprite.wgsl"),
+    });
 }
 
 bitflags::bitflags! {