entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

vulkan: remove some dead code

Browse source
This commit is contained in:
Julian Orth 2024-05-04 22:13:48 +02:00
parent 9581a94336
commit 59e4de03d1
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/gfx_apis/vulkan/image.rs
View file

@ -302,21 +302,14 @@ impl VulkanDevice {
impl VulkanDmaBufImageTemplate { impl VulkanDmaBufImageTemplate {
pub fn create_framebuffer(self: &Rc<Self>) -> Result<Rc<VulkanImage>, VulkanError> { pub fn create_framebuffer(self: &Rc<Self>) -> Result<Rc<VulkanImage>, VulkanError> {
self.create_image(true, None) self.create_image(true)
} }
pub fn create_texture( pub fn create_texture(self: &Rc<Self>) -> Result<Rc<VulkanImage>, VulkanError> {
self: &Rc<Self>, self.create_image(false)
shm: Option<VulkanShmImage>,
) -> Result<Rc<VulkanImage>, VulkanError> {
self.create_image(false, shm)
} }
fn create_image( fn create_image(self: &Rc<Self>, for_rendering: bool) -> Result<Rc<VulkanImage>, VulkanError> {
self: &Rc<Self>,
for_rendering: bool,
shm: Option<VulkanShmImage>,
) -> Result<Rc<VulkanImage>, VulkanError> {
let device = &self.renderer.device; let device = &self.renderer.device;
let max_extents = match for_rendering { let max_extents = match for_rendering {
true => self.render_max_extents, true => self.render_max_extents,
@ -351,10 +344,9 @@ impl VulkanDmaBufImageTemplate {
false => ImageCreateFlags::empty(), false => ImageCreateFlags::empty(),
}; };
let usage = ImageUsageFlags::TRANSFER_SRC let usage = ImageUsageFlags::TRANSFER_SRC
| match (for_rendering, shm.is_some()) { | match for_rendering {
(true, _) => ImageUsageFlags::COLOR_ATTACHMENT, true => ImageUsageFlags::COLOR_ATTACHMENT,
(false, false) => ImageUsageFlags::SAMPLED, false => ImageUsageFlags::SAMPLED,
(false, true) => ImageUsageFlags::SAMPLED | ImageUsageFlags::TRANSFER_DST,
}; };
let create_info = ImageCreateInfo::builder() let create_info = ImageCreateInfo::builder()
.image_type(ImageType::TYPE_2D) .image_type(ImageType::TYPE_2D)
@ -495,9 +487,7 @@ impl GfxImage for VulkanDmaBufImageTemplate {
} }
fn to_texture(self: Rc<Self>) -> Result<Rc<dyn GfxTexture>, GfxError> { fn to_texture(self: Rc<Self>) -> Result<Rc<dyn GfxTexture>, GfxError> {
self.create_texture(None) self.create_texture().map(|v| v as _).map_err(|e| e.into())
.map(|v| v as _)
.map_err(|e| e.into())
} }
fn width(&self) -> i32 { fn width(&self) -> i32 {