diff --git a/experiments/2024-10-30/src/render/pipelines.rs b/experiments/2024-10-30/src/render/pipelines.rs index 4d3bc813d..e54d6293e 100644 --- a/experiments/2024-10-30/src/render/pipelines.rs +++ b/experiments/2024-10-30/src/render/pipelines.rs @@ -1,6 +1,6 @@ use super::{ geometry::Geometry, - shaders::{Shaders, Vertex}, + shaders::{Shaders, TrianglesVertex, Vertex, VerticesVertex}, }; pub struct Pipelines { @@ -35,7 +35,10 @@ impl Pipeline { config: &wgpu::SurfaceConfiguration, uniforms: &wgpu::Buffer, ) -> Self { - let vertices_shaders = Shaders::vertices(device, config); + let shader_module = device + .create_shader_module(wgpu::include_wgsl!("shaders/vertices.wgsl")); + let vertices_shaders = + Shaders::::new(device, config, shader_module); Self::new(device, &vertices_shaders, uniforms) } @@ -44,7 +47,11 @@ impl Pipeline { config: &wgpu::SurfaceConfiguration, uniforms: &wgpu::Buffer, ) -> Self { - let triangles_shaders = Shaders::triangles(device, config); + let shader_module = device.create_shader_module(wgpu::include_wgsl!( + "shaders/triangles.wgsl" + )); + let triangles_shaders = + Shaders::::new(device, config, shader_module); Self::new(device, &triangles_shaders, uniforms) } diff --git a/experiments/2024-10-30/src/render/shaders/mod.rs b/experiments/2024-10-30/src/render/shaders/mod.rs index c456928ca..129fd4165 100644 --- a/experiments/2024-10-30/src/render/shaders/mod.rs +++ b/experiments/2024-10-30/src/render/shaders/mod.rs @@ -9,30 +9,6 @@ pub struct Shaders { _vertex: PhantomData, } -impl Shaders { - pub fn vertices( - device: &wgpu::Device, - config: &wgpu::SurfaceConfiguration, - ) -> Self { - let shader_module = - device.create_shader_module(wgpu::include_wgsl!("vertices.wgsl")); - - Self::new(device, config, shader_module) - } -} - -impl Shaders { - pub fn triangles( - device: &wgpu::Device, - config: &wgpu::SurfaceConfiguration, - ) -> Self { - let shader_module = - device.create_shader_module(wgpu::include_wgsl!("triangles.wgsl")); - - Self::new(device, config, shader_module) - } -} - impl Shaders { pub fn new( device: &wgpu::Device,