rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-10-25 01:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline redundant struct

Browse Source
This commit is contained in:
Hanno Braun 2025-01-13 20:05:00 +01:00
parent 71f15297e7
commit e5c98273f4
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experiments/2024-12-09/src/render/pipelines/mod.rs
View File

@ -3,4 +3,4 @@ mod pipelines;
pub mod triangles; pub mod triangles;
pub use self::{pipeline::Pipeline, pipelines::Pipelines}; pub use self::pipeline::Pipeline;

17
experiments/2024-12-09/src/render/pipelines/pipelines.rs
View File

@ -1,22 +1,5 @@
use glam::Mat4; 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)] #[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
#[repr(C)] #[repr(C)]
pub struct Uniforms { pub struct Uniforms {

8
experiments/2024-12-09/src/render/renderer.rs
View File

@ -5,14 +5,14 @@ use winit::window::Window;
use crate::view::OperationView; use crate::view::OperationView;
use super::{geometry::Geometry, pipelines::Pipelines, text::TextRenderer}; use super::{geometry::Geometry, pipelines::Pipeline, text::TextRenderer};
pub struct Renderer { pub struct Renderer {
pub surface: wgpu::Surface<'static>, pub surface: wgpu::Surface<'static>,
pub device: wgpu::Device, pub device: wgpu::Device,
pub queue: wgpu::Queue, pub queue: wgpu::Queue,
pub surface_config: wgpu::SurfaceConfiguration, pub surface_config: wgpu::SurfaceConfiguration,
pub pipelines: Pipelines, pub pipelines: Pipeline,
pub depth_view: wgpu::TextureView, pub depth_view: wgpu::TextureView,
pub text_renderer: TextRenderer, pub text_renderer: TextRenderer,
} }
@ -46,7 +46,7 @@ impl Renderer {
.ok_or_else(|| anyhow!("Failed to get default surface config"))?; .ok_or_else(|| anyhow!("Failed to get default surface config"))?;
surface.configure(&device, &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_view = {
let depth_texture = let depth_texture =
@ -128,7 +128,7 @@ impl Renderer {
occlusion_query_set: None, occlusion_query_set: None,
}); });
self.pipelines.triangles.draw(&mut render_pass, &triangles); self.pipelines.draw(&mut render_pass, &triangles);
self.text_renderer.render( self.text_renderer.render(
operations, operations,
&self.device, &self.device,