From ed81321bac9c2bf82a479928338d235771aa313d Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 22 Nov 2024 19:29:43 +0100 Subject: [PATCH] Inline redundant constructors --- .../2024-10-30/src/render/pipelines/mod.rs | 14 ++++++-- .../src/render/pipelines/pipeline.rs | 35 +------------------ 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/experiments/2024-10-30/src/render/pipelines/mod.rs b/experiments/2024-10-30/src/render/pipelines/mod.rs index d788d7c48..43fdd6d6f 100644 --- a/experiments/2024-10-30/src/render/pipelines/mod.rs +++ b/experiments/2024-10-30/src/render/pipelines/mod.rs @@ -15,8 +15,18 @@ impl Pipelines { config: &wgpu::SurfaceConfiguration, uniforms: &wgpu::Buffer, ) -> Self { - let vertices = Pipeline::vertices(device, config, uniforms); - let triangles = Pipeline::triangles(device, config, uniforms); + let vertices = Pipeline::::new( + device, + config, + wgpu::include_wgsl!("../shaders/vertices.wgsl"), + uniforms, + ); + let triangles = Pipeline::::new( + device, + config, + wgpu::include_wgsl!("../shaders/triangles.wgsl"), + uniforms, + ); Self { vertices, diff --git a/experiments/2024-10-30/src/render/pipelines/pipeline.rs b/experiments/2024-10-30/src/render/pipelines/pipeline.rs index 2139a5c12..c26e23edf 100644 --- a/experiments/2024-10-30/src/render/pipelines/pipeline.rs +++ b/experiments/2024-10-30/src/render/pipelines/pipeline.rs @@ -1,9 +1,6 @@ use std::marker::PhantomData; -use crate::render::{ - geometry::Geometry, - shaders::{TrianglesVertex, Vertex, VerticesVertex}, -}; +use crate::render::{geometry::Geometry, shaders::Vertex}; pub struct Pipeline { render_pipeline: wgpu::RenderPipeline, @@ -11,36 +8,6 @@ pub struct Pipeline { _vertex: PhantomData, } -impl Pipeline { - pub fn vertices( - device: &wgpu::Device, - config: &wgpu::SurfaceConfiguration, - uniforms: &wgpu::Buffer, - ) -> Self { - Self::new( - device, - config, - wgpu::include_wgsl!("../shaders/vertices.wgsl"), - uniforms, - ) - } -} - -impl Pipeline { - pub fn triangles( - device: &wgpu::Device, - config: &wgpu::SurfaceConfiguration, - uniforms: &wgpu::Buffer, - ) -> Self { - Self::new( - device, - config, - wgpu::include_wgsl!("../shaders/triangles.wgsl"), - uniforms, - ) - } -} - impl Pipeline { pub fn new( device: &wgpu::Device,