Creation of bind groups depends on preparation of buffers

Author: superdump

crates/bevy_render/src/extract_component.rs

@@ -1,8 +1,8 @@
 use crate::{
     render_resource::{encase::internal::WriteInto, DynamicUniformBuffer, ShaderType},
     renderer::{RenderDevice, RenderQueue},
-    view::ComputedVisibility,
-    Extract, ExtractSchedule, RenderApp, RenderSet,
+    view::{ComputedVisibility, ViewSet},
+    Extract, ExtractSchedule, RenderApp,
 };
 use bevy_app::{App, IntoSystemAppConfig, Plugin};
 use bevy_asset::{Asset, Handle};
@@ -83,7 +83,7 @@ impl<C: Component + ShaderType + WriteInto + Clone> Plugin for UniformComponentP
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
                 .insert_resource(ComponentUniforms::<C>::default())
-                .add_system(prepare_uniform_components::<C>.in_set(RenderSet::Prepare));
+                .add_system(prepare_uniform_components::<C>.in_set(ViewSet::PrepareUniforms));
         }
     }
 }

crates/bevy_render/src/globals.rs

@@ -3,7 +3,8 @@ use crate::{
     prelude::Shader,
     render_resource::{ShaderType, UniformBuffer},
     renderer::{RenderDevice, RenderQueue},
-    Extract, ExtractSchedule, RenderApp, RenderSet,
+    view::ViewSet,
+    Extract, ExtractSchedule, RenderApp,
 };
 use bevy_app::{App, IntoSystemAppConfigs, Plugin};
 use bevy_asset::{load_internal_asset, HandleUntyped};
@@ -27,7 +28,7 @@ impl Plugin for GlobalsPlugin {
                 .init_resource::<GlobalsBuffer>()
                 .init_resource::<Time>()
                 .add_systems((extract_frame_count, extract_time).in_schedule(ExtractSchedule))
-                .add_system(prepare_globals_buffer.in_set(RenderSet::Prepare));
+                .add_system(prepare_globals_buffer.in_set(ViewSet::PrepareUniforms));
         }
     }
 }

crates/bevy_sprite/src/mesh2d/mesh.rs

@@ -20,7 +20,8 @@ use bevy_render::{
         BevyDefault, DefaultImageSampler, GpuImage, Image, ImageSampler, TextureFormatPixelInfo,
     },
     view::{
-        ComputedVisibility, ExtractedView, ViewTarget, ViewUniform, ViewUniformOffset, ViewUniforms,
+        ComputedVisibility, ExtractedView, ViewSet, ViewTarget, ViewUniform, ViewUniformOffset,
+        ViewUniforms,
     },
     Extract, ExtractSchedule, RenderApp, RenderSet,
 };
@@ -105,8 +106,12 @@ impl Plugin for Mesh2dRenderPlugin {
                 .init_resource::<SpecializedMeshPipelines<Mesh2dPipeline>>()
                 .add_systems((
                     extract_mesh2d.in_schedule(ExtractSchedule),
-                    queue_mesh2d_bind_group.in_set(RenderSet::Queue),
-                    queue_mesh2d_view_bind_groups.in_set(RenderSet::Queue),
+                    prepare_mesh2d_bind_group
+                        .in_set(RenderSet::Prepare)
+                        .after(ViewSet::PrepareUniforms),
+                    prepare_mesh2d_view_bind_groups
+                        .in_set(RenderSet::Prepare)
+                        .after(ViewSet::PrepareUniforms),
                 ));
         }
     }
@@ -468,7 +473,7 @@ pub struct Mesh2dBindGroup {
     pub value: BindGroup,
 }
 
-pub fn queue_mesh2d_bind_group(
+pub fn prepare_mesh2d_bind_group(
     mut commands: Commands,
     mesh2d_pipeline: Res<Mesh2dPipeline>,
     render_device: Res<RenderDevice>,
@@ -493,7 +498,7 @@ pub struct Mesh2dViewBindGroup {
     pub value: BindGroup,
 }
 
-pub fn queue_mesh2d_view_bind_groups(
+pub fn prepare_mesh2d_view_bind_groups(
     mut commands: Commands,
     render_device: Res<RenderDevice>,
     mesh2d_pipeline: Res<Mesh2dPipeline>,