Rename modules

Author: MarijnS95

ash-window/src/lib.rs

@@ -49,38 +49,38 @@ pub unsafe fn create_surface(
             let surface_desc = vk::Win32SurfaceCreateInfoKHR::default()
                 .hinstance(window.hinstance as isize)
                 .hwnd(window.hwnd as isize);
-            let surface_fn = win32_surface::Win32Surface::new(entry, instance);
+            let surface_fn = win32_surface::Instance::new(entry, instance);
             surface_fn.create_win32_surface(&surface_desc, allocation_callbacks)
         }
 
         (RawDisplayHandle::Wayland(display), RawWindowHandle::Wayland(window)) => {
             let surface_desc = vk::WaylandSurfaceCreateInfoKHR::default()
                 .display(display.display)
                 .surface(window.surface);
-            let surface_fn = wayland_surface::WaylandSurface::new(entry, instance);
+            let surface_fn = wayland_surface::Instance::new(entry, instance);
             surface_fn.create_wayland_surface(&surface_desc, allocation_callbacks)
         }
 
         (RawDisplayHandle::Xlib(display), RawWindowHandle::Xlib(window)) => {
             let surface_desc = vk::XlibSurfaceCreateInfoKHR::default()
                 .dpy(display.display.cast())
                 .window(window.window);
-            let surface_fn = xlib_surface::XlibSurface::new(entry, instance);
+            let surface_fn = xlib_surface::Instance::new(entry, instance);
             surface_fn.create_xlib_surface(&surface_desc, allocation_callbacks)
         }
 
         (RawDisplayHandle::Xcb(display), RawWindowHandle::Xcb(window)) => {
             let surface_desc = vk::XcbSurfaceCreateInfoKHR::default()
                 .connection(display.connection)
                 .window(window.window);
-            let surface_fn = xcb_surface::XcbSurface::new(entry, instance);
+            let surface_fn = xcb_surface::Instance::new(entry, instance);
             surface_fn.create_xcb_surface(&surface_desc, allocation_callbacks)
         }
 
         (RawDisplayHandle::Android(_), RawWindowHandle::AndroidNdk(window)) => {
             let surface_desc =
                 vk::AndroidSurfaceCreateInfoKHR::default().window(window.a_native_window);
-            let surface_fn = android_surface::AndroidSurface::new(entry, instance);
+            let surface_fn = android_surface::Instance::new(entry, instance);
             surface_fn.create_android_surface(&surface_desc, allocation_callbacks)
         }
 

ash/src/extensions/ext/hdr_metadata.rs

@@ -1,20 +1,19 @@
 //! <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_hdr_metadata.html>
 
 use crate::vk;
-use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
 pub const NAME: &CStr = vk::ext_hdr_metadata::NAME;
 
 #[derive(Clone)]
-pub struct HdrMetadata {
+pub struct Device {
     handle: vk::Device,
     fp: vk::ext_hdr_metadata::DeviceFn,
 }
 
-impl HdrMetadata {
-    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_hdr_metadata::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))

ash/src/extensions/ext/sample_locations.rs

@@ -38,11 +38,11 @@ impl Device {
 
 /// High-level instance function wrapper
 #[derive(Clone)]
-pub struct SampleLocationsInstance {
+pub struct Instance {
     fp: vk::ext_sample_locations::InstanceFn,
 }
 
-impl SampleLocationsInstance {
+impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let fp = vk::ext_sample_locations::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(instance.handle(), name.as_ptr()))

ash/src/extensions/khr/acceleration_structure.rs

@@ -9,12 +9,12 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_acceleration_structure::NAME;
 
 #[derive(Clone)]
-pub struct AccelerationStructure {
+pub struct Device {
     handle: vk::Device,
     fp: vk::khr_acceleration_structure::DeviceFn,
 }
 
-impl AccelerationStructure {
+impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
         let fp = vk::khr_acceleration_structure::DeviceFn::load(|name| unsafe {

ash/src/extensions/khr/android_surface.rs

@@ -9,12 +9,12 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_android_surface::NAME;
 
 #[derive(Clone)]
-pub struct AndroidSurface {
+pub struct Instance {
     handle: vk::Instance,
     fp: vk::khr_android_surface::InstanceFn,
 }
 
-impl AndroidSurface {
+impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
         let fp = vk::khr_android_surface::InstanceFn::load(|name| unsafe {

ash/src/extensions/khr/buffer_device_address.rs

@@ -7,12 +7,12 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_buffer_device_address::NAME;
 
 #[derive(Clone)]
-pub struct BufferDeviceAddress {
+pub struct Device {
     handle: vk::Device,
     fp: vk::khr_buffer_device_address::DeviceFn,
 }
 
-impl BufferDeviceAddress {
+impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
         let fp = vk::khr_buffer_device_address::DeviceFn::load(|name| unsafe {

ash/src/extensions/khr/cooperative_matrix.rs

@@ -8,11 +8,11 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_cooperative_matrix::NAME;
 
 #[derive(Clone)]
-pub struct CooperativeMatrix {
+pub struct Instance {
     fp: vk::khr_cooperative_matrix::InstanceFn,
 }
 
-impl CooperativeMatrix {
+impl Instance {
     pub fn new(entry: &crate::Entry, instance: &crate::Instance) -> Self {
         let handle = instance.handle();
         let fp = vk::khr_cooperative_matrix::InstanceFn::load(|name| unsafe {

ash/src/extensions/khr/copy_commands2.rs

@@ -7,11 +7,11 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_copy_commands2::NAME;
 
 #[derive(Clone)]
-pub struct CopyCommands2 {
+pub struct Device {
     fp: vk::khr_copy_commands2::DeviceFn,
 }
 
-impl CopyCommands2 {
+impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let fp = vk::khr_copy_commands2::DeviceFn::load(|name| unsafe {
             mem::transmute(instance.get_device_proc_addr(device.handle(), name.as_ptr()))

ash/src/extensions/khr/create_render_pass2.rs

@@ -9,12 +9,12 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_create_renderpass2::NAME;
 
 #[derive(Clone)]
-pub struct CreateRenderPass2 {
+pub struct Device {
     handle: vk::Device,
     fp: vk::khr_create_renderpass2::DeviceFn,
 }
 
-impl CreateRenderPass2 {
+impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
         let fp = vk::khr_create_renderpass2::DeviceFn::load(|name| unsafe {

ash/src/extensions/khr/deferred_host_operations.rs

@@ -9,12 +9,12 @@ use std::mem;
 pub const NAME: &CStr = vk::khr_deferred_host_operations::NAME;
 
 #[derive(Clone)]
-pub struct DeferredHostOperations {
+pub struct Device {
     handle: vk::Device,
     fp: vk::khr_deferred_host_operations::DeviceFn,
 }
 
-impl DeferredHostOperations {
+impl Device {
     pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
         let handle = device.handle();
         let fp = vk::khr_deferred_host_operations::DeviceFn::load(|name| unsafe {