[update] ash for the vulkan backend.

src/backend/vulkan/Cargo.toml

@@ -24,7 +24,7 @@ arrayvec = "0.5"
 byteorder = "1"
 log = "0.4"
 libc = { version = "0.2", optional = true }
-ash = "0.32"
+ash = "0.33.1"
 hal = { path = "../../hal", version = "0.9", package = "gfx-hal" }
 parking_lot = "0.11"
 smallvec = "1.0"

src/backend/vulkan/src/command.rs

@@ -1,7 +1,4 @@
-use ash::{
-    version::{DeviceV1_0, DeviceV1_2},
-    vk,
-};
+use ash::vk;
 use smallvec::SmallVec;
 use std::{collections::hash_map::Entry, ffi::CString, mem, ops::Range, slice, sync::Arc};
 

src/backend/vulkan/src/lib.rs

@@ -32,7 +32,6 @@ use ash::Entry;
 type Entry = ash::EntryCustom<()>;
 use ash::{
     extensions::{ext, khr, nv::MeshShader},
-    version::{DeviceV1_0, EntryV1_0, InstanceV1_0},
     vk,
 };
 
@@ -594,7 +593,7 @@ impl hal::Instance<Backend> for Instance {
             libc::dlsym(libc::RTLD_NEXT, name.as_ptr())
         });
 
-        let driver_api_version = match entry.try_enumerate_instance_version() {
+        let driver_api_version = match entry?.try_enumerate_instance_version() {
             // Vulkan 1.1+
             Ok(Some(version)) => version.into(),
 

src/backend/vulkan/src/native.rs

@@ -1,10 +1,10 @@
 use crate::{Backend, RawDevice, ROUGH_MAX_ATTACHMENT_COUNT};
-use ash::{version::DeviceV1_0, vk};
 use hal::{
     device::OutOfMemory,
     image::{Extent, SubresourceRange},
     pso,
 };
+use ash::vk;
 use inplace_it::inplace_or_alloc_from_iter;
 use parking_lot::Mutex;
 use smallvec::SmallVec;

src/backend/vulkan/src/physical_device.rs

@@ -1,6 +1,5 @@
 use ash::{
     extensions::{khr::DrawIndirectCount, khr::Swapchain, nv::MeshShader},
-    version::{DeviceV1_0, InstanceV1_0},
     vk,
 };
 
@@ -681,7 +680,6 @@ impl PhysicalDeviceInfo {
 
             match get_device_properties {
                 ExtensionFn::Promoted => {
-                    use ash::version::InstanceV1_1;
                     unsafe {
                         instance
                             .inner
@@ -1249,7 +1247,8 @@ impl adapter::PhysicalDevice<Backend> for PhysicalDevice {
                     (format_properties, Vec::new())
                 }
                 Some(ref extension) => {
-                    let mut raw_format_modifiers: Vec<vk::DrmFormatModifierPropertiesEXT> = Vec::new();
+                    let mut raw_format_modifiers: Vec<vk::DrmFormatModifierPropertiesEXT> =
+                        Vec::new();
                     let mut drm_format_properties =
                         vk::DrmFormatModifierPropertiesListEXT::builder().build();
                     let mut format_properties2 = vk::FormatProperties2::builder()
@@ -1258,35 +1257,42 @@ impl adapter::PhysicalDevice<Backend> for PhysicalDevice {
                     // Ash does not implement the "double call" behaviour for this function, so it is implemented here.
                     match extension {
                         ExtensionFn::Promoted => {
-                            use ash::version::InstanceV1_1;
                             self.instance.inner.get_physical_device_format_properties2(
                                 self.handle,
                                 format.map_or(vk::Format::UNDEFINED, conv::map_format),
                                 &mut format_properties2,
                             );
-                            raw_format_modifiers.reserve_exact(drm_format_properties.drm_format_modifier_count as usize);
-                            drm_format_properties.p_drm_format_modifier_properties = raw_format_modifiers.as_mut_ptr();
+                            raw_format_modifiers.reserve_exact(
+                                drm_format_properties.drm_format_modifier_count as usize,
+                            );
+                            drm_format_properties.p_drm_format_modifier_properties =
+                                raw_format_modifiers.as_mut_ptr();
                             self.instance.inner.get_physical_device_format_properties2(
                                 self.handle,
                                 format.map_or(vk::Format::UNDEFINED, conv::map_format),
                                 &mut format_properties2,
                             );
-                            raw_format_modifiers.set_len(drm_format_properties.drm_format_modifier_count as usize);
+                            raw_format_modifiers
+                                .set_len(drm_format_properties.drm_format_modifier_count as usize);
                         }
                         ExtensionFn::Extension(extension) => {
                             extension.get_physical_device_format_properties2_khr(
                                 self.handle,
                                 format.map_or(vk::Format::UNDEFINED, conv::map_format),
                                 &mut format_properties2,
                             );
-                            raw_format_modifiers.reserve_exact(drm_format_properties.drm_format_modifier_count as usize);
-                            drm_format_properties.p_drm_format_modifier_properties = raw_format_modifiers.as_mut_ptr();
+                            raw_format_modifiers.reserve_exact(
+                                drm_format_properties.drm_format_modifier_count as usize,
+                            );
+                            drm_format_properties.p_drm_format_modifier_properties =
+                                raw_format_modifiers.as_mut_ptr();
                             extension.get_physical_device_format_properties2_khr(
                                 self.handle,
                                 format.map_or(vk::Format::UNDEFINED, conv::map_format),
                                 &mut format_properties2,
                             );
-                            raw_format_modifiers.set_len(drm_format_properties.drm_format_modifier_count as usize);
+                            raw_format_modifiers
+                                .set_len(drm_format_properties.drm_format_modifier_count as usize);
                         }
                     }
 
@@ -1450,7 +1456,6 @@ impl adapter::PhysicalDevice<Backend> for PhysicalDevice {
                 external_buffer_properties.external_memory_properties
             }
             Some(ExtensionFn::Promoted) => {
-                use ash::version::InstanceV1_1;
                 let mut external_buffer_properties =
                     vk::ExternalBufferProperties::builder().build();
                 unsafe {
@@ -1503,15 +1508,16 @@ impl adapter::PhysicalDevice<Backend> for PhysicalDevice {
         usage: image::Usage,
         view_caps: image::ViewCapabilities,
         external_memory_type: external_memory::ExternalMemoryType,
-    ) -> Result<external_memory::ExternalMemoryProperties, external_memory::ExternalImagePropertiesError>
-    {
+    ) -> Result<
+        external_memory::ExternalMemoryProperties,
+        external_memory::ExternalImagePropertiesError,
+    > {
         if self.instance.external_memory_capabilities.is_none() {
             panic!(
                 "This function rely on `Feature::EXTERNAL_MEMORY`, but the feature is not enabled"
             );
         }
 
-        use ash::version::InstanceV1_1;
         let external_memory_type_flags: hal::external_memory::ExternalMemoryTypeFlags =
             external_memory_type.into();
         let vk_external_memory_type =
@@ -1730,15 +1736,12 @@ impl adapter::PhysicalDevice<Backend> for PhysicalDevice {
                 .build();
 
             match get_physical_device_properties {
-                ExtensionFn::Promoted => {
-                    use ash::version::InstanceV1_1;
-                    unsafe {
-                        self.instance.inner.get_physical_device_properties2(
-                            self.handle,
-                            &mut physical_device_properties2,
-                        );
-                    }
-                }
+                ExtensionFn::Promoted => unsafe {
+                    self.instance.inner.get_physical_device_properties2(
+                        self.handle,
+                        &mut physical_device_properties2,
+                    );
+                },
                 ExtensionFn::Extension(get_physical_device_properties) => unsafe {
                     get_physical_device_properties.get_physical_device_properties2_khr(
                         self.handle,

src/backend/vulkan/src/pool.rs

@@ -1,7 +1,7 @@
 use crate::{command::CommandBuffer, conv, Backend, RawDevice};
 use hal::{command, pool};
 
-use ash::{version::DeviceV1_0, vk};
+use ash::vk;
 use inplace_it::inplace_or_alloc_from_iter;
 
 use std::sync::Arc;

src/backend/vulkan/src/window.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Borrow, fmt, os::raw::c_void, sync::Arc, time::Instant};
 
-use ash::{extensions::khr, version::DeviceV1_0 as _, vk};
+use ash::{extensions::khr, vk};
 use hal::{format::Format, window as w};
 
 use crate::{
@@ -205,7 +205,7 @@ impl Instance {
 
             unsafe {
                 mac_os_loader
-                    .create_mac_os_surface_mvk(&info, None)
+                    .create_mac_os_surface(&info, None)
                     .expect("Unable to create macOS surface")
             }
         };