updates diffs from clippy fixes

Author: Matthew Russo

src/bin/01_instance_creation.rs.diff

@@ -69,7 +69,7 @@
      fn main_loop(&mut self) {
          loop {
              let mut done = false;
-@@ -46,6 +77,6 @@ impl HelloTriangleApplication {
+@@ -45,6 +76,6 @@ impl HelloTriangleApplication {
  }
 
  fn main() {

src/bin/02_validation_layers.rs.diff

@@ -63,7 +63,7 @@
 +        let required_extensions = Self::get_required_extensions();
 +
 +        if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
-+            Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
++            Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
 +                .expect("failed to create Vulkan instance")
 +        } else {
 +            Instance::new(Some(&app_info), &required_extensions, None)

src/bin/09_shader_modules.rs.diff

@@ -1,4 +1,4 @@
---- a/./09_shader_modules.rs
+--- a/08_graphics_pipeline.rs
 +++ b/10_fixed_functions.rs
 @@ -30,6 +30,11 @@ use vulkano::swapchain::{
  use vulkano::format::Format;
@@ -21,32 +21,41 @@
 
          Self {
              instance,
-@@ -292,6 +297,7 @@ impl HelloTriangleApplication {
+@@ -290,8 +295,52 @@ impl HelloTriangleApplication {
+         (swap_chain, images)
+     }
 
-     fn create_graphics_pipeline(
-         device: &Arc<Device>,
+-    fn create_graphics_pipeline(_device: &Arc<Device>) {
++    fn create_graphics_pipeline(
++        device: &Arc<Device>,
 +        swap_chain_extent: [u32; 2],
-     ) {
-         mod vertex_shader {
-             vulkano_shaders::shader! {
-@@ -307,10 +313,34 @@ impl HelloTriangleApplication {
-             }
-         }
- 
--        let _vert_shader_module = vertex_shader::Shader::load(device.clone())
++    ) {
++        mod vertex_shader {
++            vulkano_shaders::shader! {
++               ty: "vertex",
++               path: "src/bin/09_shader_base.vert"
++            }
++        }
++
++        mod fragment_shader {
++            vulkano_shaders::shader! {
++                ty: "fragment",
++                path: "src/bin/09_shader_base.frag"
++            }
++        }
++
 +        let vert_shader_module = vertex_shader::Shader::load(device.clone())
-             .expect("failed to create vertex shader module!");
--        let _frag_shader_module = fragment_shader::Shader::load(device.clone())
++            .expect("failed to create vertex shader module!");
 +        let frag_shader_module = fragment_shader::Shader::load(device.clone())
-             .expect("failed to create fragment shader module!");
++            .expect("failed to create fragment shader module!");
 +
 +        let dimensions = [swap_chain_extent[0] as f32, swap_chain_extent[1] as f32];
 +        let viewport = Viewport {
 +            origin: [0.0, 0.0],
 +            dimensions,
 +            depth_range: 0.0 .. 1.0,
 +        };
-+
+ 
 +        let _pipeline_builder = Arc::new(GraphicsPipeline::start()
 +            .vertex_input(BufferlessDefinition {})
 +            .vertex_shader(vert_shader_module.main_entry_point(), ())

src/bin/10_fixed_functions.rs.diff

@@ -41,7 +41,7 @@
      }
 
 +    fn create_framebuffers(
-+        swap_chain_images: &Vec<Arc<SwapchainImage<Window>>>,
++        swap_chain_images: &[Arc<SwapchainImage<Window>>],
 +        render_pass: &Arc<RenderPassAbstract + Send + Sync>
 +    ) -> Vec<Arc<FramebufferAbstract + Send + Sync>> {
 +        swap_chain_images.iter()

src/bin/13_framebuffers.rs.diff

@@ -21,8 +21,8 @@
 +
              let mut done = false;
              self.events_loop.poll_events(|ev| {
-                 match ev {
-@@ -514,9 +517,24 @@ impl HelloTriangleApplication {
+                 if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
+@@ -513,9 +516,24 @@ impl HelloTriangleApplication {
              }
          }
      }

src/bin/15_hello_triangle.rs.diff

@@ -89,7 +89,7 @@
      fn find_queue_families(surface: &Arc<Surface<Window>>, device: &PhysicalDevice) -> QueueFamilyIndices {
          let mut indices = QueueFamilyIndices::new();
          // TODO: replace index with id to simplify?
-@@ -519,18 +533,59 @@ impl HelloTriangleApplication {
+@@ -518,18 +532,59 @@ impl HelloTriangleApplication {
      }
 
      fn draw_frame(&mut self) {

src/bin/16_swap_chain_recreation.rs.diff

@@ -16,10 +16,15 @@
  };
 
  const WIDTH: u32 = 800;
-@@ -102,6 +104,13 @@ impl Vertex {
+@@ -100,8 +102,18 @@ impl Vertex {
+         Self { pos, color }
+     }
  }
++
++#[allow(clippy:ref_in_deref)]
  impl_vertex!(Vertex, pos, color);
 
++#[allow(dead_code)]
 +#[derive(Copy, Clone)]
 +struct UniformBufferObject {
 +    model: glm::Mat4,
@@ -30,22 +35,25 @@
  fn vertices() -> [Vertex; 4] {
      [
          Vertex::new([-0.5, -0.5], [1.0, 0.0, 0.0]),
-@@ -139,10 +148,14 @@ struct HelloTriangleApplication {
+@@ -139,10 +151,17 @@ struct HelloTriangleApplication {
 
      vertex_buffer: Arc<BufferAccess + Send + Sync>,
      index_buffer: Arc<TypedBufferAccess<Content=[u16]> + Send + Sync>,
++
++    #[allow(dead_code)]
 +    uniform_buffers: Vec<Arc<CpuAccessibleBuffer<UniformBufferObject>>>,
 +
      command_buffers: Vec<Arc<AutoCommandBuffer>>,
 
      previous_frame_end: Option<Box<GpuFuture>>,
      recreate_swap_chain: bool,
 +
++    #[allow(dead_code)]
 +    start_time: Instant,
  }
 
  impl HelloTriangleApplication {
-@@ -159,12 +172,16 @@ impl HelloTriangleApplication {
+@@ -159,12 +178,16 @@ impl HelloTriangleApplication {
              &device, &graphics_queue, &present_queue, None);
 
          let render_pass = Self::create_render_pass(&device, swap_chain.format());
@@ -62,7 +70,7 @@
 
          let previous_frame_end = Some(Self::create_sync_objects(&device));
 
-@@ -191,10 +208,14 @@ impl HelloTriangleApplication {
+@@ -191,10 +214,14 @@ impl HelloTriangleApplication {
 
              vertex_buffer,
              index_buffer,
@@ -77,7 +85,7 @@
          };
 
          app.create_command_buffers();
-@@ -401,14 +422,14 @@ impl HelloTriangleApplication {
+@@ -401,14 +428,14 @@ impl HelloTriangleApplication {
          mod vertex_shader {
              vulkano_shaders::shader! {
                 ty: "vertex",
@@ -94,7 +102,7 @@
              }
          }
 
-@@ -477,6 +498,31 @@ impl HelloTriangleApplication {
+@@ -477,6 +504,31 @@ impl HelloTriangleApplication {
          buffer
      }
 
@@ -126,7 +134,7 @@
      fn create_command_buffers(&mut self) {
          let queue_family = self.graphics_queue.family();
          self.command_buffers = self.swap_chain_framebuffers.iter()
-@@ -485,9 +531,13 @@ impl HelloTriangleApplication {
+@@ -485,9 +537,13 @@ impl HelloTriangleApplication {
                      .unwrap()
                      .begin_render_pass(framebuffer.clone(), false, vec![[0.0, 0.0, 0.0, 1.0].into()])
                      .unwrap()
@@ -142,13 +150,13 @@
                      .unwrap()
                      .end_render_pass()
                      .unwrap()
-@@ -623,6 +673,36 @@ impl HelloTriangleApplication {
+@@ -622,6 +678,36 @@ impl HelloTriangleApplication {
          }
      }
 
 +    fn update_uniform_buffer(start_time: Instant, dimensions: [f32; 2]) -> UniformBufferObject {
 +        let duration = Instant::now().duration_since(start_time);
-+        let elapsed = (duration.as_secs() * 1000) + duration.subsec_millis() as u64;
++        let elapsed = (duration.as_secs() * 1000) + u64::from(duration.subsec_millis());
 +
 +        let identity_matrix = glm::mat4(
 +            1.0, 0.0, 0.0, 0.0,
@@ -179,7 +187,7 @@
      fn recreate_swap_chain(&mut self) {
          let (swap_chain, images) = Self::create_swap_chain(&self.instance, &self.surface, self.physical_device_index,
              &self.device, &self.graphics_queue, &self.present_queue, Some(self.swap_chain.clone()));
-@@ -640,4 +720,4 @@ impl HelloTriangleApplication {
+@@ -639,4 +725,4 @@ impl HelloTriangleApplication {
  fn main() {
      let mut app = HelloTriangleApplication::initialize();
      app.main_loop();