From 6dae0339dbfd97257941ef5b79f81f2ec7a17254 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Sun, 25 May 2025 21:10:58 +0200 Subject: [PATCH] Fix warning --- src/render/app.rs | 7 +++---- src/render/pipelines/triangle_pipeline.rs | 1 - src/render/scene.rs | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/render/app.rs b/src/render/app.rs index ebcf8be..69db339 100644 --- a/src/render/app.rs +++ b/src/render/app.rs @@ -4,9 +4,8 @@ use vulkano::command_buffer::{ }; use vulkano::pipeline::graphics::viewport::Viewport; use vulkano::render_pass::{AttachmentLoadOp, AttachmentStoreOp}; -use vulkano::swapchain::{PresentMode, SwapchainPresentInfo}; +use vulkano::swapchain::PresentMode; use vulkano::sync::GpuFuture; -use vulkano::{Validated, VulkanError, sync}; use vulkano_util::context::VulkanoContext; use vulkano_util::window::{VulkanoWindows, WindowDescriptor}; use winit::application::ApplicationHandler; @@ -50,7 +49,7 @@ impl ApplicationHandler for App { self.scene = Some( Scene::load( &self.vulkan_context, - &self.vulkano_windows.get_primary_renderer_mut().unwrap(), + self.vulkano_windows.get_primary_renderer_mut().unwrap(), ) .unwrap(), ); @@ -102,7 +101,7 @@ impl ApplicationHandler for App { if let Some(scene) = self.scene.as_ref() { scene - .render(&self.vulkan_context, &renderer, &mut builder) + .render(&self.vulkan_context, renderer, &mut builder) .unwrap(); } diff --git a/src/render/pipelines/triangle_pipeline.rs b/src/render/pipelines/triangle_pipeline.rs index b5f91b2..9fb3629 100644 --- a/src/render/pipelines/triangle_pipeline.rs +++ b/src/render/pipelines/triangle_pipeline.rs @@ -19,7 +19,6 @@ use vulkano::pipeline::{ DynamicState, GraphicsPipeline, PipelineLayout, PipelineShaderStageCreateInfo, }; use vulkano::shader::{EntryPoint, ShaderStages}; -use vulkano::swapchain::Swapchain; use crate::render::vertex::Vertex2D; diff --git a/src/render/scene.rs b/src/render/scene.rs index 82ae981..36ba182 100644 --- a/src/render/scene.rs +++ b/src/render/scene.rs @@ -83,12 +83,12 @@ impl Scene { vulkano_window_renderer: &VulkanoWindowRenderer, ) -> Result> { let pipeline = create_triangle_pipeline( - &vulkano_context.vulkano_context().device(), + vulkano_context.vulkano_context().device(), vulkano_window_renderer.swapchain_format(), )?; let vertex_buffer = Vertex2D::create_buffer( Vec::from_iter(VERTICES), - &vulkano_context.vulkano_context().memory_allocator(), + vulkano_context.vulkano_context().memory_allocator(), )?; Ok(Scene { @@ -108,7 +108,7 @@ impl Scene { let instance_count = vertex_count / 3; let uniform_buffer = self.get_uniform_buffer( - &vulkan_context.vulkano_context().memory_allocator(), + vulkan_context.vulkano_context().memory_allocator(), vulkano_window_renderer.aspect_ratio(), ); let layout = &self.pipeline.layout().set_layouts()[0];