diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs index c72a986bc..afc17f45f 100644 --- a/wgpu-hal/src/vulkan/device.rs +++ b/wgpu-hal/src/vulkan/device.rs @@ -456,6 +456,21 @@ impl super::Device { &self, desc: &crate::TextureDescriptor, external_memory_image_create_info: Option<&mut vk::ExternalMemoryImageCreateInfo>, + ) -> Result { + self.create_image_without_memory_with_tiling( + desc, + vk::ImageTiling::OPTIMAL, + external_memory_image_create_info, + None, + ) + } + + fn create_image_without_memory_with_tiling( + &self, + desc: &crate::TextureDescriptor, + tiling: vk::ImageTiling, + external_memory_image_create_info: Option<&mut vk::ExternalMemoryImageCreateInfo>, + drm_modifier_info: Option<&mut vk::ImageDrmFormatModifierExplicitCreateInfoEXT>, ) -> Result { let copy_size = desc.copy_extent(); @@ -496,7 +511,7 @@ impl super::Device { .mip_levels(desc.mip_level_count) .array_layers(desc.array_layer_count()) .samples(vk::SampleCountFlags::from_raw(desc.sample_count)) - .tiling(vk::ImageTiling::OPTIMAL) + .tiling(tiling) .usage(conv::map_texture_usage(desc.usage)) .sharing_mode(vk::SharingMode::EXCLUSIVE) .initial_layout(vk::ImageLayout::UNDEFINED); @@ -511,6 +526,10 @@ impl super::Device { vk_info = vk_info.push_next(ext_info); } + if let Some(drm_info) = drm_modifier_info { + vk_info = vk_info.push_next(drm_info); + } + let raw = unsafe { self.shared.raw.create_image(&vk_info, None) }.map_err(map_err)?; fn map_err(err: vk::Result) -> crate::DeviceError { // We don't use VK_EXT_image_compression_control