Variable MeshPipeline View Bind Group Layout
#10156
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| doc-valid-idents = ["sRGB", "NaN", "iOS", "glTF", "GitHub", "WebGL", "WebGPU", "GilRs"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,11 +37,10 @@ use bevy_render::{ | |
| FragmentState, FrontFace, MultisampleState, PipelineCache, PolygonMode, PrimitiveState, | ||
| PushConstantRange, RenderPipelineDescriptor, Shader, ShaderRef, ShaderStages, ShaderType, | ||
| SpecializedMeshPipeline, SpecializedMeshPipelineError, SpecializedMeshPipelines, | ||
| StencilFaceState, StencilState, TextureAspect, TextureSampleType, TextureView, | ||
| TextureViewDescriptor, TextureViewDimension, VertexState, | ||
| }, | ||
| renderer::{RenderDevice, RenderQueue}, | ||
| view::{ExtractedView, Msaa, ViewUniform, ViewUniformOffset, ViewUniforms, VisibleEntities}, | ||
| Extract, ExtractSchedule, Render, RenderApp, RenderSet, | ||
| }; | ||
|
|
@@ -52,8 +51,8 @@ use bevy_utils::tracing::error; | |
| use crate::{ | ||
| prepare_materials, setup_morph_and_skinning_defs, AlphaMode, DrawMesh, Material, | ||
| MaterialPipeline, MaterialPipelineKey, MeshLayouts, MeshPipeline, MeshPipelineKey, | ||
| MeshPipelineViewLayoutKey, OpaqueRendererMethod, RenderMaterialInstances, RenderMaterials, | ||
| RenderMeshInstances, SetMaterialBindGroup, SetMeshBindGroup, | ||
| }; | ||
|
|
||
| use std::{hash::Hash, marker::PhantomData}; | ||
|
|
@@ -636,127 +635,151 @@ where | |
|
|
||
| pub fn get_bind_group_layout_entries( | ||
| bindings: [u32; 4], | ||
| layout_key: MeshPipelineViewLayoutKey, | ||
| ) -> Vec<BindGroupLayoutEntry> { | ||
| let mut result = vec![]; | ||
|
There was a problem hiding this comment. Not a big deal considering this is run only once, but we should use an ArrayVec here. There was a problem hiding this comment. Looks like we don't depend on that crate, probably not worth it to add it just for this? There was a problem hiding this comment. I'm pretty sure we have a small array crate somewhere in tree, maybe not in bevy_pbr though but if it's already in tree in another crate it's probably fine to add it. Although, if it's only for this place it's probably not necessary There was a problem hiding this comment. I use |
||
|
|
||
| let multisampled = layout_key.contains(MeshPipelineViewLayoutKey::MULTISAMPLED); | ||
|
|
||
| if layout_key.contains(MeshPipelineViewLayoutKey::DEPTH_PREPASS) { | ||
| result.push( | ||
| // Depth texture | ||
| BindGroupLayoutEntry { | ||
| binding: bindings[0], | ||
| visibility: ShaderStages::FRAGMENT, | ||
| ty: BindingType::Texture { | ||
| multisampled, | ||
| sample_type: TextureSampleType::Depth, | ||
| view_dimension: TextureViewDimension::D2, | ||
| }, | ||
| count: None, | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| if layout_key.contains(MeshPipelineViewLayoutKey::NORMAL_PREPASS) { | ||
| result.push( | ||
| // Normal texture | ||
| BindGroupLayoutEntry { | ||
| binding: bindings[1], | ||
| visibility: ShaderStages::FRAGMENT, | ||
| ty: BindingType::Texture { | ||
| multisampled, | ||
| sample_type: TextureSampleType::Float { filterable: false }, | ||
| view_dimension: TextureViewDimension::D2, | ||
| }, | ||
| count: None, | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| if layout_key.contains(MeshPipelineViewLayoutKey::MOTION_VECTOR_PREPASS) { | ||
| result.push( | ||
| // Motion Vectors texture | ||
| BindGroupLayoutEntry { | ||
| binding: bindings[2], | ||
| visibility: ShaderStages::FRAGMENT, | ||
| ty: BindingType::Texture { | ||
| multisampled, | ||
| sample_type: TextureSampleType::Float { filterable: false }, | ||
| view_dimension: TextureViewDimension::D2, | ||
| }, | ||
| count: None, | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| if layout_key.contains(MeshPipelineViewLayoutKey::DEFERRED_PREPASS) { | ||
| result.push( | ||
| // Deferred texture | ||
| BindGroupLayoutEntry { | ||
| binding: bindings[3], | ||
| visibility: ShaderStages::FRAGMENT, | ||
| ty: BindingType::Texture { | ||
| multisampled: false, | ||
| sample_type: TextureSampleType::Uint, | ||
| view_dimension: TextureViewDimension::D2, | ||
| }, | ||
| count: None, | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| result | ||
| } | ||
|
|
||
| // Needed so the texture views can live long enough. | ||
| pub struct PrepassBindingsSet { | ||
| depth_view: Option<TextureView>, | ||
| normal_view: Option<TextureView>, | ||
| motion_vectors_view: Option<TextureView>, | ||
| deferred_view: Option<TextureView>, | ||
| } | ||
|
|
||
| impl PrepassBindingsSet { | ||
| pub fn get_entries(&self, bindings: [u32; 4]) -> Vec<BindGroupEntry> { | ||
| let mut result: Vec<BindGroupEntry> = vec![]; | ||
|
|
||
| if let Some(ref depth_view) = self.depth_view { | ||
| result.push(BindGroupEntry { | ||
| binding: bindings[0], | ||
| resource: BindingResource::TextureView(depth_view), | ||
| }); | ||
| } | ||
|
|
||
| if let Some(ref normal_view) = self.normal_view { | ||
| result.push(BindGroupEntry { | ||
| binding: bindings[1], | ||
| resource: BindingResource::TextureView(normal_view), | ||
| }); | ||
| } | ||
|
|
||
| if let Some(ref motion_vectors_view) = self.motion_vectors_view { | ||
| result.push(BindGroupEntry { | ||
| binding: bindings[2], | ||
| resource: BindingResource::TextureView(motion_vectors_view), | ||
| }); | ||
| } | ||
|
|
||
| if let Some(ref deferred_view) = self.deferred_view { | ||
| result.push(BindGroupEntry { | ||
| binding: bindings[3], | ||
| resource: BindingResource::TextureView(deferred_view), | ||
| }); | ||
| } | ||
|
|
||
| result | ||
| } | ||
| } | ||
|
|
||
| pub fn get_bindings(prepass_textures: Option<&ViewPrepassTextures>) -> PrepassBindingsSet { | ||
| let depth_desc = TextureViewDescriptor { | ||
| label: Some("prepass_depth"), | ||
| aspect: TextureAspect::DepthOnly, | ||
| ..default() | ||
| }; | ||
| let depth_view = prepass_textures | ||
| .and_then(|x| x.depth.as_ref()) | ||
| .map(|texture| texture.texture.create_view(&depth_desc)); | ||
|
|
||
| let normal_view = prepass_textures | ||
| .and_then(|x| x.normal.as_ref()) | ||
| .map(|texture| texture.default_view.clone()); | ||
|
|
||
| let motion_vectors_view = prepass_textures | ||
| .and_then(|x| x.motion_vectors.as_ref()) | ||
| .map(|texture| texture.default_view.clone()); | ||
|
|
||
| let deferred_view = prepass_textures | ||
| .and_then(|x| x.deferred.as_ref()) | ||
| .map(|texture| texture.default_view.clone()); | ||
|
|
||
| PrepassBindingsSet { | ||
| depth_view, | ||
| normal_view, | ||
| motion_vectors_view, | ||
| deferred_view, | ||
| } | ||
| } | ||
|
|
||
| // Extract the render phases for the prepass | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could the bind group creation code be moved to its own file? I think we should avoid large files like
render/mesh.rs. And it would neatly reflectmesh_bindings.rs.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extracted it. Also moved the
mesh.rsview binding creation code to the newly createdmesh_view_bindings.rs.