diff --git a/ash/src/device.rs b/ash/src/device.rs index 3f4be48..c2ef365 100644 --- a/ash/src/device.rs +++ b/ash/src/device.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; +use crate::vk; +use crate::RawPtr; use std::mem; use std::os::raw::c_void; use std::ptr; -use crate::vk; -use crate::RawPtr; #[allow(non_camel_case_types)] pub trait DeviceV1_1: DeviceV1_0 { diff --git a/ash/src/entry.rs b/ash/src/entry.rs index 3f4c4c8..be3d52d 100644 --- a/ash/src/entry.rs +++ b/ash/src/entry.rs @@ -1,5 +1,7 @@ use crate::instance::Instance; use crate::prelude::*; +use crate::vk; +use crate::RawPtr; use shared_library::dynamic_library::DynamicLibrary; use std::error::Error; use std::fmt; @@ -9,8 +11,6 @@ use std::os::raw::c_void; use std::path::Path; use std::ptr; use std::sync::Arc; -use crate::vk; -use crate::RawPtr; #[cfg(windows)] const LIB_PATH: &'static str = "vulkan-1.dll"; diff --git a/ash/src/extensions/experimental/amd.rs b/ash/src/extensions/experimental/amd.rs index c43bcb4..33292c3 100644 --- a/ash/src/extensions/experimental/amd.rs +++ b/ash/src/extensions/experimental/amd.rs @@ -23,9 +23,9 @@ * **********************************************************************************************************************/ +use crate::vk::*; use std::fmt; use std::os::raw::*; -use crate::vk::*; // Extension: `VK_AMD_gpa_interface` diff --git a/ash/src/extensions/ext/debug_marker.rs b/ash/src/extensions/ext/debug_marker.rs index 2a25493..eeead34 100644 --- a/ash/src/extensions/ext/debug_marker.rs +++ b/ash/src/extensions/ext/debug_marker.rs @@ -1,9 +1,9 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{DeviceV1_0, InstanceV1_0}; use crate::vk; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct DebugMarker { diff --git a/ash/src/extensions/ext/debug_report.rs b/ash/src/extensions/ext/debug_report.rs index 7a52e31..e22cb73 100644 --- a/ash/src/extensions/ext/debug_report.rs +++ b/ash/src/extensions/ext/debug_report.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct DebugReport { diff --git a/ash/src/extensions/ext/debug_utils.rs b/ash/src/extensions/ext/debug_utils.rs index 72af416..8760121 100644 --- a/ash/src/extensions/ext/debug_utils.rs +++ b/ash/src/extensions/ext/debug_utils.rs @@ -1,9 +1,9 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::{vk, RawPtr}; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct DebugUtils { diff --git a/ash/src/extensions/khr/android_surface.rs b/ash/src/extensions/khr/android_surface.rs index b16e2d3..c9286e2 100644 --- a/ash/src/extensions/khr/android_surface.rs +++ b/ash/src/extensions/khr/android_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct AndroidSurface { diff --git a/ash/src/extensions/khr/display_swapchain.rs b/ash/src/extensions/khr/display_swapchain.rs index fd5f99d..c11690b 100644 --- a/ash/src/extensions/khr/display_swapchain.rs +++ b/ash/src/extensions/khr/display_swapchain.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{DeviceV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct DisplaySwapchain { diff --git a/ash/src/extensions/khr/surface.rs b/ash/src/extensions/khr/surface.rs index 12c4f39..2ff85b6 100644 --- a/ash/src/extensions/khr/surface.rs +++ b/ash/src/extensions/khr/surface.rs @@ -1,11 +1,11 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; -use std::ptr; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; +use std::ptr; #[derive(Clone)] pub struct Surface { diff --git a/ash/src/extensions/khr/swapchain.rs b/ash/src/extensions/khr/swapchain.rs index 32785ad..1470246 100644 --- a/ash/src/extensions/khr/swapchain.rs +++ b/ash/src/extensions/khr/swapchain.rs @@ -1,11 +1,11 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; -use std::ptr; use crate::version::{DeviceV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; +use std::ptr; #[derive(Clone)] pub struct Swapchain { diff --git a/ash/src/extensions/khr/wayland_surface.rs b/ash/src/extensions/khr/wayland_surface.rs index 658ef0e..b758505 100644 --- a/ash/src/extensions/khr/wayland_surface.rs +++ b/ash/src/extensions/khr/wayland_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct WaylandSurface { diff --git a/ash/src/extensions/khr/win32_surface.rs b/ash/src/extensions/khr/win32_surface.rs index d19b266..939147c 100644 --- a/ash/src/extensions/khr/win32_surface.rs +++ b/ash/src/extensions/khr/win32_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct Win32Surface { diff --git a/ash/src/extensions/khr/xcb_surface.rs b/ash/src/extensions/khr/xcb_surface.rs index 55e0931..8a1c66e 100644 --- a/ash/src/extensions/khr/xcb_surface.rs +++ b/ash/src/extensions/khr/xcb_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct XcbSurface { diff --git a/ash/src/extensions/khr/xlib_surface.rs b/ash/src/extensions/khr/xlib_surface.rs index 9d579fa..e8788c0 100644 --- a/ash/src/extensions/khr/xlib_surface.rs +++ b/ash/src/extensions/khr/xlib_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct XlibSurface { diff --git a/ash/src/extensions/mvk/ios_surface.rs b/ash/src/extensions/mvk/ios_surface.rs index e7364d0..c86f439 100644 --- a/ash/src/extensions/mvk/ios_surface.rs +++ b/ash/src/extensions/mvk/ios_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct IOSSurface { diff --git a/ash/src/extensions/mvk/macos_surface.rs b/ash/src/extensions/mvk/macos_surface.rs index 5a33a48..992f864 100644 --- a/ash/src/extensions/mvk/macos_surface.rs +++ b/ash/src/extensions/mvk/macos_surface.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{EntryV1_0, InstanceV1_0}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct MacOSSurface { diff --git a/ash/src/extensions/nv/mesh_shader.rs b/ash/src/extensions/nv/mesh_shader.rs index c2fe3c7..20e3fea 100644 --- a/ash/src/extensions/nv/mesh_shader.rs +++ b/ash/src/extensions/nv/mesh_shader.rs @@ -1,8 +1,8 @@ #![allow(dead_code)] -use std::ffi::CStr; -use std::mem; use crate::version::{DeviceV1_0, InstanceV1_0}; use crate::vk; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct MeshShader { diff --git a/ash/src/extensions/nv/ray_tracing.rs b/ash/src/extensions/nv/ray_tracing.rs index 6d52dbf..591aa6a 100644 --- a/ash/src/extensions/nv/ray_tracing.rs +++ b/ash/src/extensions/nv/ray_tracing.rs @@ -1,10 +1,10 @@ #![allow(dead_code)] use crate::prelude::*; -use std::ffi::CStr; -use std::mem; use crate::version::{DeviceV1_0, InstanceV1_0, InstanceV1_1}; use crate::vk; use crate::RawPtr; +use std::ffi::CStr; +use std::mem; #[derive(Clone)] pub struct RayTracing { diff --git a/ash/src/instance.rs b/ash/src/instance.rs index 252ea86..1cb3bf1 100644 --- a/ash/src/instance.rs +++ b/ash/src/instance.rs @@ -1,11 +1,11 @@ #![allow(dead_code)] use crate::device::Device; use crate::prelude::*; +use crate::vk; +use crate::RawPtr; use std::mem; use std::os::raw::c_char; use std::ptr; -use crate::vk; -use crate::RawPtr; #[doc = ""] #[derive(Clone)] diff --git a/ash/src/util.rs b/ash/src/util.rs index e616bac..d2f50d5 100644 --- a/ash/src/util.rs +++ b/ash/src/util.rs @@ -1,9 +1,9 @@ +use crate::vk; use std::iter::Iterator; use std::marker::PhantomData; use std::mem::size_of; use std::os::raw::c_void; use std::{io, slice}; -use crate::vk; /// `Align` handles dynamic alignment. The is useful for dynamic uniform buffers where /// the alignment might be different. For example a 4x4 f32 matrix has a size of 64 bytes diff --git a/ash/tests/display.rs b/ash/tests/display.rs index 6e46eda..f4131fd 100644 --- a/ash/tests/display.rs +++ b/ash/tests/display.rs @@ -1,4 +1,3 @@ - use ash::vk; #[test] diff --git a/generator/src/bin/generator.rs b/generator/src/bin/generator.rs index 9ae054b..42d33ff 100644 --- a/generator/src/bin/generator.rs +++ b/generator/src/bin/generator.rs @@ -1,4 +1,3 @@ - use generator::write_source_code; use std::path::Path; diff --git a/generator/src/lib.rs b/generator/src/lib.rs index 55368a7..60a26ab 100644 --- a/generator/src/lib.rs +++ b/generator/src/lib.rs @@ -1,6 +1,5 @@ #![recursion_limit = "256"] - #[macro_use] extern crate nom; use proc_macro2;