forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary .view_layouts (#13394)

Browse Source 
# Objective

- The volumetric fog PR originally needed to be modified to use
`.view_layouts` but that was changed in another PR. The merge with main
still kept those around.

## Solution

- Remove them because they aren't necessary
This commit is contained in:
IceSentry 2024-05-16 15:12:36 -04:00 committed by GitHub
parent be03ba1b68
commit aa907d5437
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_gizmos/src/pipeline_3d.rs
View File

@ -115,7 +115,6 @@ impl SpecializedRenderPipeline for LineGizmoPipeline {
let view_layout = self let view_layout = self
.mesh_pipeline .mesh_pipeline
.view_layouts
.get_view_layout(key.view_key.into()) .get_view_layout(key.view_key.into())
.clone(); .clone();
@ -209,7 +208,6 @@ impl SpecializedRenderPipeline for LineJointGizmoPipeline {
let view_layout = self let view_layout = self
.mesh_pipeline .mesh_pipeline
.view_layouts
.get_view_layout(key.view_key.into()) .get_view_layout(key.view_key.into())
.clone(); .clone();

5
crates/bevy_pbr/src/deferred/mod.rs
View File

@ -320,10 +320,7 @@ impl SpecializedRenderPipeline for DeferredLightingLayout {
RenderPipelineDescriptor { RenderPipelineDescriptor {
label: Some("deferred_lighting_pipeline".into()), label: Some("deferred_lighting_pipeline".into()),
layout: vec![ layout: vec![
self.mesh_pipeline self.mesh_pipeline.get_view_layout(key.into()).clone(),
.view_layouts
.get_view_layout(key.into())
.clone(),
self.bind_group_layout_1.clone(), self.bind_group_layout_1.clone(),
], ],
vertex: VertexState { vertex: VertexState {

5
crates/bevy_pbr/src/meshlet/material_draw_prepare.rs
View File

@ -165,10 +165,7 @@ pub fn prepare_material_meshlet_meshes_main_opaque_pass<M: Material>(
let pipeline_descriptor = RenderPipelineDescriptor { let pipeline_descriptor = RenderPipelineDescriptor {
label: material_pipeline_descriptor.label, label: material_pipeline_descriptor.label,
layout: vec![ layout: vec![
mesh_pipeline mesh_pipeline.get_view_layout(view_key.into()).clone(),
.view_layouts
.get_view_layout(view_key.into())
.clone(),
gpu_scene.material_draw_bind_group_layout(), gpu_scene.material_draw_bind_group_layout(),
material_pipeline.material_layout.clone(), material_pipeline.material_layout.clone(),
], ],

2
crates/bevy_pbr/src/render/mesh.rs
View File

@ -1557,7 +1557,7 @@ impl SpecializedMeshPipeline for MeshPipeline {
shader_defs.push("PBR_MULTI_LAYER_MATERIAL_TEXTURES_SUPPORTED".into()); shader_defs.push("PBR_MULTI_LAYER_MATERIAL_TEXTURES_SUPPORTED".into());
} }
let mut bind_group_layout = vec![self.view_layouts.get_view_layout(key.into()).clone()]; let mut bind_group_layout = vec![self.get_view_layout(key.into()).clone()];
if key.msaa_samples() > 1 { if key.msaa_samples() > 1 {
shader_defs.push("MULTISAMPLED".into()); shader_defs.push("MULTISAMPLED".into());