extension: Rename wrapper structs to Device or Instance

Author: MarijnS95

ash-examples/src/lib.rs

@@ -146,9 +146,9 @@ pub struct ExampleBase {
     pub entry: Entry,
     pub instance: Instance,
     pub device: Device,
-    pub surface_loader: surface::Surface,
-    pub swapchain_loader: swapchain::SwapchainDevice,
-    pub debug_utils_loader: debug_utils::DebugUtilsInstance,
+    pub surface_loader: surface::Instance,
+    pub swapchain_loader: swapchain::Device,
+    pub debug_utils_loader: debug_utils::Instance,
     pub window: winit::window::Window,
     pub event_loop: RefCell<EventLoop<()>>,
     pub debug_call_back: vk::DebugUtilsMessengerEXT,
@@ -279,7 +279,7 @@ impl ExampleBase {
                 )
                 .pfn_user_callback(Some(vulkan_debug_callback));
 
-            let debug_utils_loader = debug_utils::DebugUtilsInstance::new(&entry, &instance);
+            let debug_utils_loader = debug_utils::Instance::new(&entry, &instance);
             let debug_call_back = debug_utils_loader
                 .create_debug_utils_messenger(&debug_info, None)
                 .unwrap();
@@ -294,7 +294,7 @@ impl ExampleBase {
             let pdevices = instance
                 .enumerate_physical_devices()
                 .expect("Physical device error");
-            let surface_loader = surface::Surface::new(&entry, &instance);
+            let surface_loader = surface::Instance::new(&entry, &instance);
             let (pdevice, queue_family_index) = pdevices
                 .iter()
                 .find_map(|pdevice| {
@@ -383,7 +383,7 @@ impl ExampleBase {
                 .cloned()
                 .find(|&mode| mode == vk::PresentModeKHR::MAILBOX)
                 .unwrap_or(vk::PresentModeKHR::FIFO);
-            let swapchain_loader = swapchain::SwapchainDevice::new(&instance, &device);
+            let swapchain_loader = swapchain::Device::new(&instance, &device);
 
             let swapchain_create_info = vk::SwapchainCreateInfoKHR::default()
                 .surface(surface)

ash-window/examples/winit.rs

@@ -41,7 +41,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             window.raw_window_handle(),
             None,
         )?;
-        let surface_fn = ash::extensions::khr::surface::Surface::new(&entry, &instance);
+        let surface_fn = ash::extensions::khr::surface::Instance::new(&entry, &instance);
         println!("surface: {surface:?}");
 
         event_loop.run(move |event, _, control_flow| match event {

ash-window/src/lib.rs

@@ -94,7 +94,7 @@ pub unsafe fn create_surface(
             };
 
             let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(&*layer);
-            let surface_fn = metal_surface::MetalSurface::new(entry, instance);
+            let surface_fn = metal_surface::Instance::new(entry, instance);
             surface_fn.create_metal_surface(&surface_desc, allocation_callbacks)
         }
 
@@ -108,7 +108,7 @@ pub unsafe fn create_surface(
             };
 
             let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(&*layer);
-            let surface_fn = metal_surface::MetalSurface::new(entry, instance);
+            let surface_fn = metal_surface::Instance::new(entry, instance);
             surface_fn.create_metal_surface(&surface_desc, allocation_callbacks)
         }
 

ash/src/extensions/amd/buffer_marker.rs

@@ -1,18 +1,17 @@
 use crate::vk;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::amd_buffer_marker::NAME;
 
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_AMD_buffer_marker.html>
 #[derive(Clone)]
-pub struct BufferMarker {
+pub struct Device {
     fp: vk::amd_buffer_marker::DeviceFn,
 }
 
-impl BufferMarker {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+impl Device {
+    pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let fp = vk::amd_buffer_marker::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(device.handle(), name.as_ptr()))
         });

ash/src/extensions/amd/shader_info.rs

@@ -1,20 +1,19 @@
 use crate::prelude::*;
 use crate::vk;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::amd_shader_info::NAME;
 
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_AMD_shader_info.html>
 #[derive(Clone)]
-pub struct ShaderInfo {
+pub struct Device {
     handle: vk::Device,
     fp: vk::amd_shader_info::DeviceFn,
 }
 
-impl ShaderInfo {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+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 {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))

ash/src/extensions/amdx/shader_enqueue.rs

@@ -1,21 +1,20 @@
 use crate::prelude::*;
 use crate::vk;
 use crate::RawPtr;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::amdx_shader_enqueue::NAME;
 
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_AMDX_shader_enqueue.html>
 #[derive(Clone)]
-pub struct ShaderEnqueue {
+pub struct Device {
     handle: vk::Device,
     fp: vk::amdx_shader_enqueue::DeviceFn,
 }
 
-impl ShaderEnqueue {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+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 {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))

ash/src/extensions/android/external_memory_android_hardware_buffer.rs

@@ -1,20 +1,19 @@
 use crate::prelude::*;
 use crate::vk;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::android_external_memory_android_hardware_buffer::NAME;
 
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_ANDROID_external_memory_android_hardware_buffer.html>
 #[derive(Clone)]
-pub struct ExternalMemoryAndroidHardwareBuffer {
+pub struct Device {
     handle: vk::Device,
     fp: vk::android_external_memory_android_hardware_buffer::DeviceFn,
 }
 
-impl ExternalMemoryAndroidHardwareBuffer {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+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 {

ash/src/extensions/ext/acquire_drm_display.rs

@@ -1,19 +1,18 @@
 use crate::prelude::*;
 use crate::vk;
-use crate::{Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::ext_acquire_drm_display::NAME;
 
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_acquire_drm_display.html>
 #[derive(Clone)]
-pub struct AcquireDrmDisplay {
+pub struct Instance {
     fp: vk::ext_acquire_drm_display::InstanceFn,
 }
 
-impl AcquireDrmDisplay {
-    pub fn new(entry: &Entry, instance: &Instance) -> Self {
+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 {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))

ash/src/extensions/ext/buffer_device_address.rs

@@ -1,19 +1,18 @@
 use crate::vk;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::ext_buffer_device_address::NAME;
 
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_buffer_device_address.html>
 #[derive(Clone)]
-pub struct BufferDeviceAddress {
+pub struct Device {
     handle: vk::Device,
     fp: vk::ext_buffer_device_address::DeviceFn,
 }
 
-impl BufferDeviceAddress {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+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 {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))

ash/src/extensions/ext/calibrated_timestamps.rs

@@ -1,6 +1,5 @@
 use crate::prelude::*;
 use crate::vk;
-use crate::{Device, Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
@@ -9,13 +8,13 @@ pub const NAME: &CStr = vk::ext_calibrated_timestamps::NAME;
 /// High-level device function wrapper for
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_calibrated_timestamps.html>
 #[derive(Clone)]
-pub struct CalibratedTimestampsDevice {
+pub struct Device {
     handle: vk::Device,
     fp: vk::ext_calibrated_timestamps::DeviceFn,
 }
 
-impl CalibratedTimestampsDevice {
-    pub fn new(instance: &Instance, device: &Device) -> Self {
+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 {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
@@ -59,12 +58,12 @@ impl CalibratedTimestampsDevice {
 /// High-level instance function wrapper for
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_calibrated_timestamps.html>
 #[derive(Clone)]
-pub struct CalibratedTimestampsInstance {
+pub struct Instance {
     fp: vk::ext_calibrated_timestamps::InstanceFn,
 }
 
-impl CalibratedTimestampsInstance {
-    pub fn new(entry: &Entry, instance: &Instance) -> Self {
+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 {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))