Skip to content

Commit d92c39e

Browse files
committed
CI
1 parent 264b462 commit d92c39e

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

crates/bevy_material/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Provides a material abstraction for bevy
2-
#![allow(missing_docs)]
2+
#![allow(missing_docs, reason = "Needs docs")]
33

44
extern crate alloc;
55

crates/bevy_material/src/render/mesh_bindings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::render_resource::BindGroupLayoutDescriptor;
22

3-
/// All possible [`BindGroupLayout`]s in bevy's default mesh shader (`mesh.wgsl`).
3+
/// All possible [`BindGroupLayoutDescriptor`]s in bevy's default mesh shader (`mesh.wgsl`).
44
#[derive(Clone)]
55
pub struct MeshLayouts {
66
/// The mesh model uniform (transform) and nothing else.

crates/bevy_pbr/src/material.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ impl Plugin for MaterialsPlugin {
297297
.add_render_command::<Transparent3d, DrawMaterial>()
298298
.add_render_command::<Opaque3d, DrawMaterial>()
299299
.add_render_command::<AlphaMask3d, DrawMaterial>()
300-
.add_systems(RenderStartup, init_material_pipeline)
300+
.add_systems(
301+
RenderStartup,
302+
init_material_pipeline.after(init_mesh_pipeline),
303+
)
301304
.add_systems(
302305
Render,
303306
(

crates/bevy_pbr/src/render/mesh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ pub fn collect_meshes_for_gpu_building(
12521252
previous_input_buffer.ensure_nonempty();
12531253
}
12541254

1255-
fn init_mesh_pipeline(world: &mut World) {
1255+
pub fn init_mesh_pipeline(world: &mut World) {
12561256
let shader = load_embedded_asset!(world, "mesh.wgsl");
12571257
let mut system_state: SystemState<(
12581258
Res<RenderDevice>,

crates/bevy_pbr/src/ssr/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ use bevy_utils::{once, prelude::default};
4747
use tracing::info;
4848

4949
use crate::{
50-
binding_arrays_are_usable, graph::NodePbr, mesh_pipeline_view_layout_key_from_msaa,
51-
MeshPipelineViewLayoutKey, MeshPipelineViewLayouts, MeshViewBindGroup, RenderViewLightProbes,
52-
ViewEnvironmentMapUniformOffset, ViewFogUniformOffset, ViewLightProbesUniformOffset,
53-
ViewLightsUniformOffset,
50+
binding_arrays_are_usable, graph::NodePbr, init_mesh_pipeline_view_layouts,
51+
mesh_pipeline_view_layout_key_from_msaa, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts,
52+
MeshViewBindGroup, RenderViewLightProbes, ViewEnvironmentMapUniformOffset,
53+
ViewFogUniformOffset, ViewLightProbesUniformOffset, ViewLightsUniformOffset,
5454
};
5555

5656
/// Enables screen-space reflections for a camera.
@@ -197,7 +197,7 @@ impl Plugin for ScreenSpaceReflectionsPlugin {
197197
.add_systems(
198198
RenderStartup,
199199
(
200-
init_screen_space_reflections_pipeline,
200+
init_screen_space_reflections_pipeline.after(init_mesh_pipeline_view_layouts),
201201
add_screen_space_reflections_render_graph_edges,
202202
),
203203
)

crates/bevy_pbr/src/volumetric_fog/mod.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ use bevy_render::{
5050
};
5151
use render::{VolumetricFogNode, VolumetricFogPipeline, VolumetricFogUniformBuffer};
5252

53-
use crate::{graph::NodePbr, volumetric_fog::render::init_volumetric_fog_pipeline};
53+
use crate::{
54+
graph::NodePbr, init_mesh_pipeline_view_layouts,
55+
volumetric_fog::render::init_volumetric_fog_pipeline,
56+
};
5457

5558
pub mod render;
5659

@@ -84,7 +87,10 @@ impl Plugin for VolumetricFogPlugin {
8487
})
8588
.init_resource::<SpecializedRenderPipelines<VolumetricFogPipeline>>()
8689
.init_resource::<VolumetricFogUniformBuffer>()
87-
.add_systems(RenderStartup, init_volumetric_fog_pipeline)
90+
.add_systems(
91+
RenderStartup,
92+
init_volumetric_fog_pipeline.after(init_mesh_pipeline_view_layouts),
93+
)
8894
.add_systems(ExtractSchedule, render::extract_volumetric_fog)
8995
.add_systems(
9096
Render,

0 commit comments

Comments
 (0)