Fix clippy, rewrite the render pass abstraction

Author: friendlymatthew

src/png/grammar.rs

@@ -39,7 +39,7 @@ impl ImageHeader {
     pub(crate) const fn num_bytes_per_pixel(&self) -> usize {
         let bits_per_pixel = self.color_type.num_channels() * self.bit_depth;
 
-        ((bits_per_pixel + 7) / 8) as usize
+        bits_per_pixel.div_ceil(8) as usize
     }
 }
 

src/renderer/app_state.rs

@@ -6,11 +6,9 @@ use crate::{
             FeatureUniform,
             TransformAction,
         },
-        gpu_state::{
-            GpuResourceAllocator,
-            Shader,
-        },
+        gpu_state::GpuResourceAllocator,
         mouse_state::MouseState,
+        shader::Shader,
         shape::{
             compute_radius,
             Shape,
@@ -19,7 +17,16 @@ use crate::{
     },
 };
 use anyhow::Result;
-use wgpu::SurfaceError;
+use wgpu::{
+    Color,
+    IndexFormat,
+    LoadOp,
+    Operations,
+    RenderPassColorAttachment,
+    RenderPassDescriptor,
+    StoreOp,
+    SurfaceError,
+};
 use winit::{
     dpi::PhysicalSize,
     event::{
@@ -246,7 +253,53 @@ impl<'a> AppState<'a> {
     }
 
     pub(crate) fn render(&self) -> Result<(), SurfaceError> {
-        self.gpu_allocator.render(&self.image_shader)?;
+        let (output, view, mut encoder) = self.gpu_allocator.begin_frame()?;
+
+        // Image shader render pass
+        {
+            let mut render_pass = encoder.begin_render_pass(&RenderPassDescriptor {
+                label: Some("content render pass"),
+                color_attachments: &[Some(RenderPassColorAttachment {
+                    view: &view,
+                    resolve_target: None,
+                    ops: Operations {
+                        load: LoadOp::Clear(Color {
+                            r: 0.1,
+                            g: 0.2,
+                            b: 0.3,
+                            a: 1.0,
+                        }),
+                        store: StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                occlusion_query_set: None,
+                timestamp_writes: None,
+            });
+
+            render_pass.set_pipeline(&self.image_shader.render_pipeline);
+
+            let mut i = 0;
+
+            self.image_shader.texture_resources.iter().for_each(|r| {
+                render_pass.set_bind_group(i, &r.bind_group, &[]);
+                i += 1;
+            });
+
+            self.image_shader.uniform_resources.iter().for_each(|r| {
+                render_pass.set_bind_group(i, &r.bind_group, &[]);
+                i += 1;
+            });
+
+            render_pass.set_vertex_buffer(0, self.gpu_allocator.vertex_buffer.slice(..));
+            render_pass.set_index_buffer(
+                self.gpu_allocator.index_buffer.slice(..),
+                IndexFormat::Uint16,
+            );
+        }
+
+        self.gpu_allocator.end_frame(encoder);
+        output.present();
 
         Ok(())
     }

src/renderer/draw_uniform.rs

@@ -21,16 +21,16 @@ impl DrawUniform {
         self.crosshair == 1
     }
 
-    pub(crate) fn toggle_crosshair(&mut self) {
+    pub(crate) const fn toggle_crosshair(&mut self) {
         self.crosshair = !self.crosshair() as u32;
     }
 
-    pub(crate) fn set_circle_center(&mut self, x: f32, y: f32) {
+    pub(crate) const fn set_circle_center(&mut self, x: f32, y: f32) {
         self.circle_center_x = x;
         self.circle_center_y = y;
     }
 
-    pub(crate) fn set_circle_radius(&mut self, radius: f32) {
+    pub(crate) const fn set_circle_radius(&mut self, radius: f32) {
         self.circle_radius = radius;
     }
 }

src/renderer/feature_uniform.rs

@@ -35,7 +35,7 @@ impl FeatureUniform {
         }
     }
 
-    pub(crate) fn reset_features(&mut self) {
+    pub(crate) const fn reset_features(&mut self) {
         self.grayscale = 0;
         // self.sepia = 0;
         self.invert = 0;
@@ -59,15 +59,15 @@ impl FeatureUniform {
         self.invert == 1
     }
 
-    pub(crate) fn toggle_grayscale(&mut self) {
+    pub(crate) const fn toggle_grayscale(&mut self) {
         self.grayscale = !self.grayscale() as u32;
     }
 
     // pub(crate) fn toggle_sepia(&mut self) {
     //     self.sepia = !self.sepia() as u32;
     // }
 
-    pub(crate) fn toggle_invert(&mut self) {
+    pub(crate) const fn toggle_invert(&mut self) {
         self.invert = !self.invert() as u32;
     }
 }
@@ -81,7 +81,7 @@ impl FeatureUniform {
         self.blur == 1
     }
 
-    pub(crate) fn toggle_blur(&mut self) {
+    pub(crate) const fn toggle_blur(&mut self) {
         self.blur = !self.blur() as u32;
     }
 
@@ -103,7 +103,7 @@ impl FeatureUniform {
         self.sharpen == 1
     }
 
-    pub(crate) fn toggle_sharpen(&mut self) {
+    pub(crate) const fn toggle_sharpen(&mut self) {
         self.sharpen = !self.sharpen() as u32;
     }
 
@@ -117,7 +117,7 @@ impl FeatureUniform {
 }
 
 impl FeatureUniform {
-    pub(crate) fn update_window_dimensions(&mut self, width: u32, height: u32) {
+    pub(crate) const fn update_window_dimensions(&mut self, width: u32, height: u32) {
         self.width = width;
         self.height = height;
     }
@@ -128,7 +128,7 @@ impl FeatureUniform {
         self.edge_detect == 1
     }
 
-    pub(crate) fn toggle_edge_detect(&mut self) {
+    pub(crate) const fn toggle_edge_detect(&mut self) {
         self.edge_detect = !self.edge_detect() as u32;
     }
 }