Move MeshPipeline to bevy_material, and its render impls to bevy_render

Author: Zeophlite

crates/bevy_internal/Cargo.toml

@@ -145,6 +145,7 @@ android-game-activity = ["bevy_winit/android-game-activity"]
 
 # Transmission textures in `StandardMaterial`:
 pbr_transmission_textures = [
+  "bevy_render?/pbr_transmission_textures",
   "bevy_pbr?/pbr_transmission_textures",
   "bevy_gltf?/pbr_transmission_textures",
 ]
@@ -154,27 +155,34 @@ pbr_clustered_decals = ["bevy_pbr?/pbr_clustered_decals"]
 
 # Light Texture support
 pbr_light_textures = [
+  "bevy_render?/pbr_light_textures",
   "bevy_pbr?/pbr_clustered_decals",
   "bevy_pbr?/pbr_light_textures",
 ]
 
 # Multi-layer material textures in `StandardMaterial`:
 pbr_multi_layer_material_textures = [
+  "bevy_render?/pbr_multi_layer_material_textures",
   "bevy_pbr?/pbr_multi_layer_material_textures",
   "bevy_gltf?/pbr_multi_layer_material_textures",
 ]
 
 # Anisotropy texture in `StandardMaterial`:
 pbr_anisotropy_texture = [
+  "bevy_render?/pbr_anisotropy_texture",
   "bevy_pbr?/pbr_anisotropy_texture",
   "bevy_gltf?/pbr_anisotropy_texture",
 ]
 
 # Percentage-closer soft shadows
-experimental_pbr_pcss = ["bevy_pbr?/experimental_pbr_pcss"]
+experimental_pbr_pcss = [
+  "bevy_render?/experimental_pbr_pcss",
+  "bevy_pbr?/experimental_pbr_pcss",
+]
 
 # Specular textures in `StandardMaterial`:
 pbr_specular_textures = [
+  "bevy_render?/pbr_specular_textures",
   "bevy_pbr?/pbr_specular_textures",
   "bevy_gltf?/pbr_specular_textures",
 ]

crates/bevy_material/src/render/mesh.rs

@@ -1,5 +1,9 @@
+use bevy_asset::Handle;
+use bevy_ecs::resource::Resource;
+use bevy_image::Image;
 use bevy_mesh::BaseMeshPipelineKey;
-use crate::render_resource::*;
+use bevy_shader::Shader;
+use crate::{render::{MeshLayouts, MeshPipelineViewLayout, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts}, render_resource::*};
 
 use static_assertions::const_assert_eq;
 
@@ -16,7 +20,52 @@ use static_assertions::const_assert_eq;
 pub const MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES: usize = 10;
 
 
-// pub struct MeshPipeline {
+/// 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.
+    pub shader: Handle<Shader>,
+    /// `MeshUniform`s are stored in arrays in buffers. If storage buffers are available, they
+    /// are used and this will be `None`, otherwise uniform buffers will be used with batches
+    /// of this many `MeshUniform`s, stored at dynamic offsets within the uniform buffer.
+    /// Use code like this in custom shaders:
+    /// ```wgsl
+    /// ##ifdef PER_OBJECT_BUFFER_BATCH_SIZE
+    /// @group(1) @binding(0) var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
+    /// ##else
+    /// @group(1) @binding(0) var<storage> mesh: array<Mesh>;
+    /// ##endif // PER_OBJECT_BUFFER_BATCH_SIZE
+    /// ```
+    pub per_object_buffer_batch_size: Option<u32>,
+
+    /// Whether binding arrays (a.k.a. bindless textures) are usable on the
+    /// current render device.
+    ///
+    /// This affects whether reflection probes can be used.
+    pub binding_arrays_are_usable: bool,
+
+    /// Whether clustered decals are usable on the current render device.
+    pub clustered_decals_are_usable: bool,
+
+    /// Whether skins will use uniform buffers on account of storage buffers
+    /// being unavailable on this platform.
+    pub skins_use_uniform_buffers: bool,
+}
+
+impl MeshPipeline {
+    pub fn get_view_layout(
+        &self,
+        layout_key: MeshPipelineViewLayoutKey,
+    ) -> &MeshPipelineViewLayout {
+        self.view_layouts.get_view_layout(layout_key)
+    }
+}
 
 bitflags::bitflags! {
     #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Hash)]

crates/bevy_pbr/src/prepass/mod.rs

@@ -3,7 +3,7 @@ mod prepass_bindings;
 use crate::{
     alpha_mode_pipeline_key, binding_arrays_are_usable, buffer_layout,
     collect_meshes_for_gpu_building, init_material_pipeline, set_mesh_motion_vector_flags,
-    setup_morph_and_skinning_defs, skin, DeferredDrawFunction, DeferredFragmentShader,
+    skin, DeferredDrawFunction, DeferredFragmentShader,
     DeferredVertexShader, DrawMesh, EntitySpecializationTicks, ErasedMaterialPipelineKey,
     MaterialPipeline, MaterialProperties, MeshLayouts, MeshPipeline, MeshPipelineKey,
     OpaqueRendererMethod, PreparedMaterial, PrepassDrawFunction, PrepassFragmentShader,
@@ -27,7 +27,7 @@ use bevy_render::{
     alpha::AlphaMode,
     batching::gpu_preprocessing::GpuPreprocessingSupport,
     globals::{GlobalsBuffer, GlobalsUniform},
-    mesh::{allocator::MeshAllocator, RenderMesh},
+    mesh::{allocator::MeshAllocator, pipeline::setup_morph_and_skinning_defs, RenderMesh},
     render_asset::{prepare_assets, RenderAssets},
     render_phase::*,
     render_resource::{binding_types::uniform_buffer, *},