diff --git a/experiments/2024-12-09/src/render/pipelines/mod.rs b/experiments/2024-12-09/src/render/pipelines/mod.rs index 40fac80b3..bcd5c6f71 100644 --- a/experiments/2024-12-09/src/render/pipelines/mod.rs +++ b/experiments/2024-12-09/src/render/pipelines/mod.rs @@ -3,4 +3,4 @@ mod pipelines; pub mod triangles; -pub use self::{pipeline::Pipeline, pipelines::Pipelines}; +pub use self::pipeline::Pipeline; diff --git a/experiments/2024-12-09/src/render/pipelines/pipelines.rs b/experiments/2024-12-09/src/render/pipelines/pipelines.rs index bb20e3d44..c533b0738 100644 --- a/experiments/2024-12-09/src/render/pipelines/pipelines.rs +++ b/experiments/2024-12-09/src/render/pipelines/pipelines.rs @@ -1,22 +1,5 @@ use glam::Mat4; -use super::Pipeline; - -pub struct Pipelines { - pub triangles: Pipeline, -} - -impl Pipelines { - pub fn new( - device: &wgpu::Device, - surface_configuration: &wgpu::SurfaceConfiguration, - ) -> Self { - let triangles = Pipeline::new(device, surface_configuration); - - Self { triangles } - } -} - #[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)] #[repr(C)] pub struct Uniforms { diff --git a/experiments/2024-12-09/src/render/renderer.rs b/experiments/2024-12-09/src/render/renderer.rs index 98216959e..65f8aed48 100644 --- a/experiments/2024-12-09/src/render/renderer.rs +++ b/experiments/2024-12-09/src/render/renderer.rs @@ -5,14 +5,14 @@ use winit::window::Window; use crate::view::OperationView; -use super::{geometry::Geometry, pipelines::Pipelines, text::TextRenderer}; +use super::{geometry::Geometry, pipelines::Pipeline, text::TextRenderer}; pub struct Renderer { pub surface: wgpu::Surface<'static>, pub device: wgpu::Device, pub queue: wgpu::Queue, pub surface_config: wgpu::SurfaceConfiguration, - pub pipelines: Pipelines, + pub pipelines: Pipeline, pub depth_view: wgpu::TextureView, pub text_renderer: TextRenderer, } @@ -46,7 +46,7 @@ impl Renderer { .ok_or_else(|| anyhow!("Failed to get default surface config"))?; surface.configure(&device, &surface_config); - let pipelines = Pipelines::new(&device, &surface_config); + let pipelines = Pipeline::new(&device, &surface_config); let depth_view = { let depth_texture = @@ -128,7 +128,7 @@ impl Renderer { occlusion_query_set: None, }); - self.pipelines.triangles.draw(&mut render_pass, &triangles); + self.pipelines.draw(&mut render_pass, &triangles); self.text_renderer.render( operations, &self.device,