Insert DummyImage resource

Author: Zeophlite

crates/bevy_material/src/render/mesh.rs

@@ -23,13 +23,18 @@ use static_assertions::const_assert_eq;
 #[cfg(debug_assertions)]
 pub const MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES: usize = 10;
 
+// A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures
+#[derive(Resource, Clone)]
+pub struct DummyImage {
+    // This dummy white texture is to be used in place of optional StandardMaterial textures
+    pub dummy_white_image: Handle<Image>,
+}
+
 /// All data needed to construct a pipeline for rendering 3D meshes.
 #[derive(Resource, Clone)]
 pub struct MeshPipeline {
     /// A reference to all the mesh pipeline view layouts.
     pub view_layouts: MeshPipelineViewLayouts,
-    // This dummy white texture is to be used in place of optional StandardMaterial textures
-    pub dummy_white_image: Handle<Image>,
     pub clustered_forward_buffer_binding_type: BufferBindingType,
     pub mesh_layouts: MeshLayouts,
     /// The shader asset handle.

crates/bevy_pbr/src/material.rs

@@ -280,6 +280,14 @@ pub struct MaterialsPlugin {
 
 impl Plugin for MaterialsPlugin {
     fn build(&self, app: &mut App) {
+        let mut images = app.world_mut().resource_mut::<Assets<Image>>();
+
+        // A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures
+        let image = Image::default();
+        let dummy_white_image = images.add(image);
+
+        let dummy_image = DummyImage { dummy_white_image };
+
         app.add_plugins((PrepassPipelinePlugin, PrepassPlugin::new(self.debug_flags)));
         if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
@@ -292,6 +300,7 @@ impl Plugin for MaterialsPlugin {
                 .init_resource::<DrawFunctions<Shadow>>()
                 .init_resource::<RenderMaterialInstances>()
                 .init_resource::<MaterialBindGroupAllocators>()
+                .insert_resource(dummy_image)
                 .add_render_command::<Shadow, DrawPrepass>()
                 .add_render_command::<Transmissive3d, DrawMaterial>()
                 .add_render_command::<Transparent3d, DrawMaterial>()

crates/bevy_pbr/src/render/mesh.rs

@@ -1261,21 +1261,15 @@ pub fn init_mesh_pipeline(world: &mut World) {
         Res<RenderDevice>,
         Res<RenderAdapter>,
         Res<MeshPipelineViewLayouts>,
-        ResMut<Assets<Image>>,
     )> = SystemState::new(world);
-    let (render_device, render_adapter, view_layouts, mut images) = system_state.get_mut(world);
+    let (render_device, render_adapter, view_layouts) = system_state.get_mut(world);
 
     let clustered_forward_buffer_binding_type =
         render_device.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT);
 
-    // A 1x1x1 'all 1.0' texture to use as a dummy texture to use in place of optional StandardMaterial textures
-    let image = Image::default();
-    let dummy_white_image = images.add(image);
-
     let res = MeshPipeline {
         view_layouts: view_layouts.clone(),
         clustered_forward_buffer_binding_type,
-        dummy_white_image,
         mesh_layouts: MeshLayouts::new(&render_device, &render_adapter),
         shader,
         per_object_buffer_batch_size: GpuArrayBuffer::<MeshUniform>::batch_size(