Split extension modules into vendor/extension hierarchy

ash-rs · Mar 17, 2024 · 03ad1f4 · 03ad1f4
1 parent f06c0c7
commit 03ad1f4
Show file tree

Hide file tree

Showing 86 changed files with 19,434 additions and 19,154 deletions.
diff --git a/ash-examples/src/lib.rs b/ash-examples/src/lib.rs
@@ -22,9 +22,7 @@ use std::ops::Drop;
 use std::os::raw::c_char;
 
 #[cfg(any(target_os = "macos", target_os = "ios"))]
-use ash::vk::{
-    khr_get_physical_device_properties2, khr_portability_enumeration, khr_portability_subset,
-};
+use ash::vk::khr;
 
 use winit::{
     event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
@@ -238,9 +236,9 @@ impl ExampleBase {
 
             #[cfg(any(target_os = "macos", target_os = "ios"))]
             {
-                extension_names.push(khr_portability_enumeration::NAME.as_ptr());
+                extension_names.push(khr::portability_enumeration::NAME.as_ptr());
                 // Enabling this extension is a requirement when using `VK_KHR_portability_subset`
-                extension_names.push(khr_get_physical_device_properties2::NAME.as_ptr());
+                extension_names.push(khr::get_physical_device_properties2::NAME.as_ptr());
             }
 
             let appinfo = vk::ApplicationInfo::default()
@@ -324,7 +322,7 @@ impl ExampleBase {
             let device_extension_names_raw = [
                 swapchain::NAME.as_ptr(),
                 #[cfg(any(target_os = "macos", target_os = "ios"))]
-                khr_portability_subset::NAME.as_ptr(),
+                khr::portability_subset::NAME.as_ptr(),
             ];
             let features = vk::PhysicalDeviceFeatures {
                 shader_clip_distance: 1,

diff --git a/ash/src/extensions/amd/buffer_marker.rs b/ash/src/extensions/amd/buffer_marker.rs
@@ -4,16 +4,16 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::amd_buffer_marker::NAME;
+pub const NAME: &CStr = vk::amd::buffer_marker::NAME;
 
 #[derive(Clone)]
 pub struct Device {
-    fp: vk::amd_buffer_marker::DeviceFn,
+    fp: vk::amd::buffer_marker::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
-        let fp = vk::amd_buffer_marker::DeviceFn::load(|name| unsafe {
+        let fp = vk::amd::buffer_marker::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(device.handle(), name.as_ptr()))
         });
         Self { fp }
@@ -39,7 +39,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::amd_buffer_marker::DeviceFn {
+    pub fn fp(&self) -> &vk::amd::buffer_marker::DeviceFn {
         &self.fp
     }
 }
diff --git a/ash/src/extensions/amd/shader_info.rs b/ash/src/extensions/amd/shader_info.rs
@@ -5,18 +5,18 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::amd_shader_info::NAME;
+pub const NAME: &CStr = vk::amd::shader_info::NAME;
 
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::amd_shader_info::DeviceFn,
+    fp: vk::amd::shader_info::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::amd_shader_info::DeviceFn::load(|name| unsafe {
+        let fp = vk::amd::shader_info::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -67,7 +67,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::amd_shader_info::DeviceFn {
+    pub fn fp(&self) -> &vk::amd::shader_info::DeviceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/amdx/shader_enqueue.rs b/ash/src/extensions/amdx/shader_enqueue.rs
@@ -6,18 +6,18 @@ use crate::RawPtr;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::amdx_shader_enqueue::NAME;
+pub const NAME: &CStr = vk::amdx::shader_enqueue::NAME;
 
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::amdx_shader_enqueue::DeviceFn,
+    fp: vk::amdx::shader_enqueue::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::amdx_shader_enqueue::DeviceFn::load(|name| unsafe {
+        let fp = vk::amdx::shader_enqueue::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -119,7 +119,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::amdx_shader_enqueue::DeviceFn {
+    pub fn fp(&self) -> &vk::amdx::shader_enqueue::DeviceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/android/external_memory_android_hardware_buffer.rs b/ash/src/extensions/android/external_memory_android_hardware_buffer.rs
@@ -5,19 +5,19 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::android_external_memory_android_hardware_buffer::NAME;
+pub const NAME: &CStr = vk::android::external_memory_android_hardware_buffer::NAME;
 
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::android_external_memory_android_hardware_buffer::DeviceFn,
+    fp: vk::android::external_memory_android_hardware_buffer::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
         let fp =
-            vk::android_external_memory_android_hardware_buffer::DeviceFn::load(|name| unsafe {
+            vk::android::external_memory_android_hardware_buffer::DeviceFn::load(|name| unsafe {
                 mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
             });
         Self { handle, fp }
@@ -46,7 +46,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::android_external_memory_android_hardware_buffer::DeviceFn {
+    pub fn fp(&self) -> &vk::android::external_memory_android_hardware_buffer::DeviceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/acquire_drm_display.rs b/ash/src/extensions/ext/acquire_drm_display.rs
@@ -5,17 +5,17 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_acquire_drm_display::NAME;
+pub const NAME: &CStr = vk::ext::acquire_drm_display::NAME;
 
 #[derive(Clone)]
 pub struct Instance {
-    fp: vk::ext_acquire_drm_display::InstanceFn,
+    fp: vk::ext::acquire_drm_display::InstanceFn,
 }
 
 impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_acquire_drm_display::InstanceFn::load(|name| unsafe {
+        let fp = vk::ext::acquire_drm_display::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { fp }
@@ -46,7 +46,7 @@ impl Instance {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_acquire_drm_display::InstanceFn {
+    pub fn fp(&self) -> &vk::ext::acquire_drm_display::InstanceFn {
         &self.fp
     }
 }
diff --git a/ash/src/extensions/ext/buffer_device_address.rs b/ash/src/extensions/ext/buffer_device_address.rs
@@ -4,18 +4,18 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_buffer_device_address::NAME;
+pub const NAME: &CStr = vk::ext::buffer_device_address::NAME;
 
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::ext_buffer_device_address::DeviceFn,
+    fp: vk::ext::buffer_device_address::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::ext_buffer_device_address::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext::buffer_device_address::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -31,7 +31,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_buffer_device_address::DeviceFn {
+    pub fn fp(&self) -> &vk::ext::buffer_device_address::DeviceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/calibrated_timestamps.rs b/ash/src/extensions/ext/calibrated_timestamps.rs
@@ -5,19 +5,19 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_calibrated_timestamps::NAME;
+pub const NAME: &CStr = vk::ext::calibrated_timestamps::NAME;
 
 /// High-level device function wrapper
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::ext_calibrated_timestamps::DeviceFn,
+    fp: vk::ext::calibrated_timestamps::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::ext_calibrated_timestamps::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext::calibrated_timestamps::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -46,7 +46,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_calibrated_timestamps::DeviceFn {
+    pub fn fp(&self) -> &vk::ext::calibrated_timestamps::DeviceFn {
         &self.fp
     }
 
@@ -59,13 +59,13 @@ impl Device {
 /// High-level instance function wrapper
 #[derive(Clone)]
 pub struct Instance {
-    fp: vk::ext_calibrated_timestamps::InstanceFn,
+    fp: vk::ext::calibrated_timestamps::InstanceFn,
 }
 
 impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_calibrated_timestamps::InstanceFn::load(|name| unsafe {
+        let fp = vk::ext::calibrated_timestamps::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { fp }
@@ -87,7 +87,7 @@ impl Instance {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_calibrated_timestamps::InstanceFn {
+    pub fn fp(&self) -> &vk::ext::calibrated_timestamps::InstanceFn {
         &self.fp
     }
 }
diff --git a/ash/src/extensions/ext/debug_marker.rs b/ash/src/extensions/ext/debug_marker.rs
@@ -5,18 +5,18 @@ use crate::vk;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_debug_marker::NAME;
+pub const NAME: &CStr = vk::ext::debug_marker::NAME;
 
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::ext_debug_marker::DeviceFn,
+    fp: vk::ext::debug_marker::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::ext_debug_marker::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext::debug_marker::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -58,7 +58,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_marker::DeviceFn {
+    pub fn fp(&self) -> &vk::ext::debug_marker::DeviceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/debug_report.rs b/ash/src/extensions/ext/debug_report.rs
@@ -6,18 +6,18 @@ use crate::RawPtr;
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_debug_report::NAME;
+pub const NAME: &CStr = vk::ext::debug_report::NAME;
 
 #[derive(Clone)]
 pub struct Instance {
     handle: vk::Instance,
-    fp: vk::ext_debug_report::InstanceFn,
+    fp: vk::ext::debug_report::InstanceFn,
 }
 
 impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_debug_report::InstanceFn::load(|name| unsafe {
+        let fp = vk::ext::debug_report::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -55,7 +55,7 @@ impl Instance {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_report::InstanceFn {
+    pub fn fp(&self) -> &vk::ext::debug_report::InstanceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/debug_utils.rs b/ash/src/extensions/ext/debug_utils.rs
@@ -5,19 +5,19 @@ use crate::{vk, RawPtr};
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_debug_utils::NAME;
+pub const NAME: &CStr = vk::ext::debug_utils::NAME;
 
 /// High-level device function wrapper
 #[derive(Clone)]
 pub struct Device {
     handle: vk::Device,
-    fp: vk::ext_debug_utils::DeviceFn,
+    fp: vk::ext::debug_utils::DeviceFn,
 }
 
 impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
-        let fp = vk::ext_debug_utils::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext::debug_utils::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -94,7 +94,7 @@ impl Device {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_utils::DeviceFn {
+    pub fn fp(&self) -> &vk::ext::debug_utils::DeviceFn {
         &self.fp
     }
 
@@ -108,13 +108,13 @@ impl Device {
 #[derive(Clone)]
 pub struct Instance {
     handle: vk::Instance,
-    fp: vk::ext_debug_utils::InstanceFn,
+    fp: vk::ext::debug_utils::InstanceFn,
 }
 
 impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_debug_utils::InstanceFn::load(|name| unsafe {
+        let fp = vk::ext::debug_utils::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -164,7 +164,7 @@ impl Instance {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_utils::InstanceFn {
+    pub fn fp(&self) -> &vk::ext::debug_utils::InstanceFn {
         &self.fp
     }