rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-05 18:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline redundant constructors

Browse Source
This commit is contained in:
Hanno Braun 2024-11-22 19:29:43 +01:00
parent 6d35aed162
commit ed81321bac
2 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
experiments/2024-10-30/src/render/pipelines/mod.rs
View File

@ -15,8 +15,18 @@ impl Pipelines {
config: &wgpu::SurfaceConfiguration, config: &wgpu::SurfaceConfiguration,
uniforms: &wgpu::Buffer, uniforms: &wgpu::Buffer,
) -> Self { ) -> Self {
let vertices = Pipeline::vertices(device, config, uniforms); let vertices = Pipeline::<VerticesVertex>::new(
let triangles = Pipeline::triangles(device, config, uniforms); device,
config,
wgpu::include_wgsl!("../shaders/vertices.wgsl"),
uniforms,
);
let triangles = Pipeline::<TrianglesVertex>::new(
device,
config,
wgpu::include_wgsl!("../shaders/triangles.wgsl"),
uniforms,
);
Self { Self {
vertices, vertices,

35
experiments/2024-10-30/src/render/pipelines/pipeline.rs
View File

@ -1,9 +1,6 @@
use std::marker::PhantomData; use std::marker::PhantomData;
use crate::render::{ use crate::render::{geometry::Geometry, shaders::Vertex};
geometry::Geometry,
shaders::{TrianglesVertex, Vertex, VerticesVertex},
};
pub struct Pipeline<V> { pub struct Pipeline<V> {
render_pipeline: wgpu::RenderPipeline, render_pipeline: wgpu::RenderPipeline,
@ -11,36 +8,6 @@ pub struct Pipeline<V> {
_vertex: PhantomData<V>, _vertex: PhantomData<V>,
} }
impl Pipeline<VerticesVertex> {
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<TrianglesVertex> {
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<V> Pipeline<V> { impl<V> Pipeline<V> {
pub fn new( pub fn new(
device: &wgpu::Device, device: &wgpu::Device,