doc + notes

Author: Zeophlite

crates/bevy_core_pipeline/src/core_3d/mod.rs

@@ -846,12 +846,10 @@ pub fn prepare_core_3d_depth_textures(
     }
 }
 
-/// A material can specify [`MaterialProperties:reads_view_transmission_texture`] to read from [`ViewTransmissionTexture`].
+/// A material can specify [`MaterialProperties::reads_view_transmission_texture`](`bevy_material::material::MaterialProperties`) to read from [`ViewTransmissionTexture`].
 ///
 /// This allows taking color output from the [`Opaque3d`] pass as an input, (for screen-space transmission) but requires
 /// rendering to take place in a separate [`Transmissive3d`] pass.
-///
-/// [MaterialProperties]: bevy_material::material::MaterialProperties
 #[derive(Component)]
 pub struct ViewTransmissionTexture {
     pub texture: Texture,

crates/bevy_material/src/render/mesh_bindings.rs

@@ -16,19 +16,15 @@ pub struct MeshLayouts {
     /// frame's joint matrices, so that we can compute motion vectors.
     pub skinned_motion: BindGroupLayoutDescriptor,
 
-    /// Also includes the uniform and [`MorphAttributes`] for morph targets.
-    ///
-    /// [`MorphAttributes`]: bevy_mesh::morph::MorphAttributes
+    /// Also includes the uniform and [`MorphAttributes`](`bevy_mesh::morph::MorphAttributes`) for morph targets.
     pub morphed: BindGroupLayoutDescriptor,
 
     /// Like [`MeshLayouts::morphed`], but includes a slot for the previous
     /// frame's morph weights, so that we can compute motion vectors.
     pub morphed_motion: BindGroupLayoutDescriptor,
 
     /// Also includes both uniforms for skinning and morph targets, also the
-    /// morph target [`MorphAttributes`] binding.
-    ///
-    /// [`MorphAttributes`]: bevy_mesh::morph::MorphAttributes
+    /// morph target [`MorphAttributes`](`bevy_mesh::morph::MorphAttributes`) binding.
     pub morphed_skinned: BindGroupLayoutDescriptor,
 
     /// Like [`MeshLayouts::morphed_skinned`], but includes slots for the

crates/bevy_pbr/src/material.rs

@@ -72,7 +72,7 @@ pub use bevy_material::material::*;
 /// Materials must implement [`AsBindGroup`] to define how data will be transferred to the GPU and bound in shaders.
 /// [`AsBindGroup`] can be derived, which makes generating bindings straightforward. See the [`AsBindGroup`] docs for details.
 ///
-/// Doc refs [MaterialPipeline], [`MaterialProperties`]
+/// Doc refs [`MaterialPipeline`], [`MaterialProperties`]
 ///
 /// # Example
 ///

crates/bevy_pbr/src/render/mesh.rs

@@ -618,7 +618,7 @@ impl RenderMeshInstanceGpuBuilder {
     /// Flushes this mesh instance to the [`RenderMeshInstanceGpu`] and
     /// [`MeshInputUniform`] tables, replacing the existing entry if applicable.
     ///
-    /// Provides the mesh instance id for [`RenderMeshInstanceShared:for_gpu_building`]
+    /// Provides the mesh instance id for [`RenderMeshInstanceShared::for_gpu_building`]
     fn update(
         mut self,
         entity: MainEntity,

crates/bevy_render/src/mesh/render.rs

@@ -53,7 +53,7 @@ pub struct MeshUniform {
     /// The index of this mesh's first vertex in the vertex buffer.
     ///
     /// Multiple meshes can be packed into a single vertex buffer (see
-    /// [`MeshAllocator`](`mesh::allocator::MeshAllocator`) ). This value stores the offset of the first vertex in
+    /// [`MeshAllocator`](`crate::mesh::allocator::MeshAllocator`) ). This value stores the offset of the first vertex in
     /// this mesh in that buffer.
     pub first_vertex_index: u32,
     /// The current skin index, or `u32::MAX` if there's no skin.
@@ -100,13 +100,13 @@ pub struct MeshInputUniform {
     /// The index of this mesh's first vertex in the vertex buffer.
     ///
     /// Multiple meshes can be packed into a single vertex buffer (see
-    /// [`MeshAllocator`](`mesh::allocator::MeshAllocator`) ). This value stores the offset of the first vertex in
+    /// [`MeshAllocator`](`crate::mesh::allocator::MeshAllocator`) ). This value stores the offset of the first vertex in
     /// this mesh in that buffer.
     pub first_vertex_index: u32,
     /// The index of this mesh's first index in the index buffer, if any.
     ///
     /// Multiple meshes can be packed into a single index buffer (see
-    /// [`MeshAllocator`](`mesh::allocator::MeshAllocator`) ). This value stores the offset of the first index in
+    /// [`MeshAllocator`](`crate::mesh::allocator::MeshAllocator`) ). This value stores the offset of the first index in
     /// this mesh in that buffer.
     ///
     /// If this mesh isn't indexed, this value is ignored.

release-content/migration-guides/material.md

@@ -0,0 +1,31 @@
+---
+title: "`bevy_material`"
+pull_requests: [21543]
+---
+
+TODO: This is just a commit log, need to clean up
+
+The following have moved:
+- initial bevy_material
+- Opaque move
+- Move ShaderLabel, DrawFunctionLabel, wgpu exports from render_resource, bind_group_layout_entries
+- Move DrawFunctionId
+- Move SpecializedMeshPipelineError
+- Move BindGroupLayoutDescriptor, RenderPipelineDescriptor, NoFragmentStateError, VertexState, FragmentState, ComputePipelineDescriptor
+- Move MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES, MeshPipelineKey
+- Move MATERIAL_BIND_GROUP_INDEX, ErasedMaterialPipelineKey, ErasedMaterialKey, ErasedMaterialKeyVTable, RenderPhaseType
+- Convert MeshPipelineViewLayouts and MeshPipeline to RenderStartup system
+- mesh_pipeline_view_layout_key_from_msaa and mesh_pipeline_view_layout_key_from_view_prepass_textures
+- Move MeshPipelineViewLayout, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts
+- Make impl MeshLayouts a trait
+- Move MeshLayouts
+- Deprecate get_image_texture for MeshPipeline and Mesh2dPipeline, change dummy to Image in MeshPipeline
+- Move most of lightmap to bevy_render
+- Move MaterialBindingId, MaterialBindGroupIndex, MaterialBindGroupSlot to bevy_render
+- Move MeshTransforms, MeshUniform, MeshInputUniform, MeshFlags, RenderMeshInstanceFlags, RenderMeshInstanceCpu, RenderMeshInstanceGpu, PreviousGlobalTransform, RenderMeshInstanceShared, remove_mesh_input_uniform to bevy_render
+- Move MAX_JOINTS, MAX_TOTAL_JOINTS, JOINTS_PER_ALLOCATION_UNIT, JOINT_EXTRACTION_THRESHOLD_FACTOR, SkinByteOffset, SkinUniforms, SkinUniformInfo to bevy_render
+- Move util consts
+- Move RenderMeshInstances, RenderMeshInstancesCpu, RenderMeshInstancesGpu, RenderMeshQueueData to bevy_render
+- Move MeshPipeline to bevy_material, and its render impls to bevy_render
+- Move MaterialProperties and MaterialPipeline to bevy_material
+- Insert DummyImage resource

release-content/release-notes/material.md

@@ -0,0 +1,9 @@
+---
+title: "`bevy_material`"
+authors: ["@Zeophlite", "@atlv24"]
+pull_requests: [21543]
+---
+
+TODO: this needs further work
+
+Materials can now be defined without a renderer