From 93d91cf76d5a031a110b6e0db5916566733ab484 Mon Sep 17 00:00:00 2001 From: IceSentry Date: Sun, 12 May 2024 15:47:03 -0400 Subject: [PATCH] yeet unnecessary .view_layouts --- crates/bevy_gizmos/src/pipeline_3d.rs | 2 -- crates/bevy_pbr/src/deferred/mod.rs | 5 +---- crates/bevy_pbr/src/meshlet/material_draw_prepare.rs | 5 +---- crates/bevy_pbr/src/render/mesh.rs | 2 +- crates/bevy_pbr/src/render/mesh_view_bindings.rs | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/crates/bevy_gizmos/src/pipeline_3d.rs b/crates/bevy_gizmos/src/pipeline_3d.rs index 76c02c1f38f9b..e247220d541bc 100644 --- a/crates/bevy_gizmos/src/pipeline_3d.rs +++ b/crates/bevy_gizmos/src/pipeline_3d.rs @@ -115,7 +115,6 @@ impl SpecializedRenderPipeline for LineGizmoPipeline { let view_layout = self .mesh_pipeline - .view_layouts .get_view_layout(key.view_key.into()) .clone(); @@ -209,7 +208,6 @@ impl SpecializedRenderPipeline for LineJointGizmoPipeline { let view_layout = self .mesh_pipeline - .view_layouts .get_view_layout(key.view_key.into()) .clone(); diff --git a/crates/bevy_pbr/src/deferred/mod.rs b/crates/bevy_pbr/src/deferred/mod.rs index 00e09935f5e1e..8bf4c70baa093 100644 --- a/crates/bevy_pbr/src/deferred/mod.rs +++ b/crates/bevy_pbr/src/deferred/mod.rs @@ -320,10 +320,7 @@ impl SpecializedRenderPipeline for DeferredLightingLayout { RenderPipelineDescriptor { label: Some("deferred_lighting_pipeline".into()), layout: vec![ - self.mesh_pipeline - .view_layouts - .get_view_layout(key.into()) - .clone(), + self.mesh_pipeline.get_view_layout(key.into()).clone(), self.bind_group_layout_1.clone(), ], vertex: VertexState { diff --git a/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs b/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs index d1c6042ecf4e0..65fa6272a2bbe 100644 --- a/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs +++ b/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs @@ -165,10 +165,7 @@ pub fn prepare_material_meshlet_meshes_main_opaque_pass( let pipeline_descriptor = RenderPipelineDescriptor { label: material_pipeline_descriptor.label, layout: vec![ - mesh_pipeline - .view_layouts - .get_view_layout(view_key.into()) - .clone(), + mesh_pipeline.get_view_layout(view_key.into()).clone(), gpu_scene.material_draw_bind_group_layout(), material_pipeline.material_layout.clone(), ], diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs index f11ca65b878b0..9c163643530f3 100644 --- a/crates/bevy_pbr/src/render/mesh.rs +++ b/crates/bevy_pbr/src/render/mesh.rs @@ -1554,7 +1554,7 @@ impl SpecializedMeshPipeline for MeshPipeline { 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 { shader_defs.push("MULTISAMPLED".into()); diff --git a/crates/bevy_pbr/src/render/mesh_view_bindings.rs b/crates/bevy_pbr/src/render/mesh_view_bindings.rs index 1c3b1d7f94baa..e1f9ee573f1e6 100644 --- a/crates/bevy_pbr/src/render/mesh_view_bindings.rs +++ b/crates/bevy_pbr/src/render/mesh_view_bindings.rs @@ -504,7 +504,7 @@ pub fn prepare_mesh_view_bind_groups( .map(|t| &t.screen_space_ambient_occlusion_texture.default_view) .unwrap_or(&fallback_ssao); - let layout = &mesh_pipeline.view_layouts.get_view_layout( + let layout = &mesh_pipeline.get_view_layout( MeshPipelineViewLayoutKey::from(*msaa) | MeshPipelineViewLayoutKey::from(prepass_textures), );