From 59e4de03d12fe5e6180787596e43868603ad8c27 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Sat, 4 May 2024 22:13:48 +0200 Subject: [PATCH] vulkan: remove some dead code --- src/gfx_apis/vulkan/image.rs | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/gfx_apis/vulkan/image.rs b/src/gfx_apis/vulkan/image.rs index f8f3fa8f..524969f8 100644 --- a/src/gfx_apis/vulkan/image.rs +++ b/src/gfx_apis/vulkan/image.rs @@ -302,21 +302,14 @@ impl VulkanDevice { impl VulkanDmaBufImageTemplate { pub fn create_framebuffer(self: &Rc) -> Result, VulkanError> { - self.create_image(true, None) + self.create_image(true) } - pub fn create_texture( - self: &Rc, - shm: Option, - ) -> Result, VulkanError> { - self.create_image(false, shm) + pub fn create_texture(self: &Rc) -> Result, VulkanError> { + self.create_image(false) } - fn create_image( - self: &Rc, - for_rendering: bool, - shm: Option, - ) -> Result, VulkanError> { + fn create_image(self: &Rc, for_rendering: bool) -> Result, VulkanError> { let device = &self.renderer.device; let max_extents = match for_rendering { true => self.render_max_extents, @@ -351,10 +344,9 @@ impl VulkanDmaBufImageTemplate { false => ImageCreateFlags::empty(), }; let usage = ImageUsageFlags::TRANSFER_SRC - | match (for_rendering, shm.is_some()) { - (true, _) => ImageUsageFlags::COLOR_ATTACHMENT, - (false, false) => ImageUsageFlags::SAMPLED, - (false, true) => ImageUsageFlags::SAMPLED | ImageUsageFlags::TRANSFER_DST, + | match for_rendering { + true => ImageUsageFlags::COLOR_ATTACHMENT, + false => ImageUsageFlags::SAMPLED, }; let create_info = ImageCreateInfo::builder() .image_type(ImageType::TYPE_2D) @@ -495,9 +487,7 @@ impl GfxImage for VulkanDmaBufImageTemplate { } fn to_texture(self: Rc) -> Result, GfxError> { - self.create_texture(None) - .map(|v| v as _) - .map_err(|e| e.into()) + self.create_texture().map(|v| v as _).map_err(|e| e.into()) } fn width(&self) -> i32 {