Merge remote-tracking branch 'origin/main' into no-std-support

Author: MarijnS95

Cargo.toml

@@ -48,12 +48,8 @@ objc2-metal = { version = "0.3", default-features = false, features = [
     "std",
 ], optional = true }
 
-[target.'cfg(windows)'.dependencies]
-# Only needed for public-winapi interop helpers
-winapi = { version = "0.3.9", features = ["d3d12", "winerror", "impl-default", "impl-debug"], optional = true }
-
 [target.'cfg(windows)'.dependencies.windows]
-version = ">=0.53,<=0.59"
+version = ">=0.53, <=0.61"
 features = [
     "Win32_Graphics_Direct3D12",
     "Win32_Graphics_Dxgi_Common",
@@ -65,12 +61,9 @@ optional = true
 ash = { version = "0.38", default-features = false, features = ["debug", "loaded"] }
 env_logger = "0.10"
 
-[target.'cfg(windows)'.dev-dependencies]
-winapi = { version = "0.3.9", features = ["d3d12", "d3d12sdklayers", "dxgi1_6", "winerror", "impl-default", "impl-debug", "winuser", "windowsx", "libloaderapi"] }
-
 [target.'cfg(windows)'.dev-dependencies.windows]
 # API-breaks since Windows 0.58 only affect our examples
-version = ">=0.58,<=0.59"
+version = ">=0.58, <=0.61"
 features = [
     "Win32_Graphics_Direct3D",
     "Win32_Graphics_Direct3D12",
@@ -86,10 +79,6 @@ objc2-metal = { version = "0.3", default-features = false, features = [
 name = "vulkan-buffer"
 required-features = ["vulkan", "ash/loaded"]
 
-[[example]]
-name = "d3d12-buffer"
-required-features = ["d3d12", "public-winapi"]
-
 [[example]]
 name = "d3d12-buffer-winrs"
 required-features = ["d3d12"]
@@ -104,8 +93,6 @@ visualizer = ["dep:egui", "dep:egui_extras"]
 vulkan = ["dep:ash"]
 d3d12 = ["dep:windows"]
 metal = ["dep:objc2", "dep:objc2-metal", "dep:objc2-foundation"]
-# Expose helper functionality for winapi types to interface with gpu-allocator, which is primarily windows-rs driven
-public-winapi = ["dep:winapi"]
 # Enables the FreeListAllocator when `std` is not enabled by using the `hashbrown` crate
 hashbrown = ["dep:hashbrown"]
 

README.md

@@ -19,13 +19,6 @@ gpu-allocator = "0.27.0"
 
 This crate provides a fully written in Rust memory allocator for Vulkan, DirectX 12 and Metal.
 
-## [Windows-rs] and [winapi]
-
-`gpu-allocator` recently migrated from [winapi] to [windows-rs] but still provides convenient helpers to convert to and from [winapi] types, enabled when compiling with the `public-winapi` crate feature.
-
-[Windows-rs]: https://github.com/microsoft/windows-rs
-[winapi]: https://github.com/retep998/winapi-rs
-
 ## Setting up the Vulkan memory allocator
 
 ```rust