[d3d12 wgl] Upgrade to windows 0.61 crates

https://github.com/microsoft/windows-rs/releases/tag/63

Author: MarijnS95

Cargo.lock

@@ -207,10 +207,10 @@ gpu-alloc = "0.6"
 gpu-descriptor = "0.3.2"
 
 # DX12 dependencies
-gpu-allocator = { version = "0.27", default-features = false }
+gpu-allocator = { version = "0.27", default-features = false, features = ["hashbrown"] }
 range-alloc = "0.1"
 mach-dxcompiler-rs = { version = "0.1.4", default-features = false } # remember to increase max_shader_model if applicable
-windows-core = { version = "0.59", default-features = false }
+windows-core = { version = "0.61", default-features = false }
 
 # Gles dependencies
 khronos-egl = "6"
@@ -220,7 +220,7 @@ glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
 
 # DX12 and GLES dependencies
-windows = { version = "0.59", default-features = false }
+windows = { version = "0.61", default-features = false }
 
 # wasm32 dependencies
 console_error_panic_hook = "0.1.5"
@@ -252,7 +252,8 @@ ndk-sys = "0.6"
 wgpu = { path = "./wgpu" }
 
 # https://github.com/Traverse-Research/gpu-allocator/pull/258
-gpu-allocator = { git = "https://github.com/Traverse-Research/gpu-allocator", rev = "955b13a" }
+# https://github.com/Traverse-Research/gpu-allocator/pull/269
+gpu-allocator = { git = "https://github.com/Traverse-Research/gpu-allocator", rev = "673e4ecb503af4188e0ca576acd0dad681f22413" }
 
 [profile.release]
 lto = "thin"

Cargo.toml

@@ -1905,8 +1905,8 @@ impl crate::Device for super::Device {
             DepthBias: bias.constant,
             DepthBiasClamp: bias.clamp,
             SlopeScaledDepthBias: bias.slope_scale,
-            DepthClipEnable: Foundation::BOOL::from(!desc.primitive.unclipped_depth),
-            MultisampleEnable: Foundation::BOOL::from(desc.multisample.count > 1),
+            DepthClipEnable: windows_core::BOOL::from(!desc.primitive.unclipped_depth),
+            MultisampleEnable: windows_core::BOOL::from(desc.multisample.count > 1),
             ForcedSampleCount: 0,
             AntialiasedLineEnable: false.into(),
             ConservativeRaster: if desc.primitive.conservative {
@@ -1936,7 +1936,7 @@ impl crate::Device for super::Device {
                 RasterizedStream: 0,
             },
             BlendState: Direct3D12::D3D12_BLEND_DESC {
-                AlphaToCoverageEnable: Foundation::BOOL::from(
+                AlphaToCoverageEnable: windows_core::BOOL::from(
                     desc.multisample.alpha_to_coverage_enabled,
                 ),
                 IndependentBlendEnable: true.into(),

wgpu-hal/src/dx12/device.rs

@@ -92,7 +92,7 @@ use hashbrown::HashMap;
 use parking_lot::{Mutex, RwLock};
 use suballocation::Allocator;
 use windows::{
-    core::{Free, Interface},
+    core::{Free as _, Interface},
     Win32::{
         Foundation,
         Graphics::{Direct3D, Direct3D12, DirectComposition, Dxgi},

wgpu-hal/src/dx12/mod.rs

@@ -144,7 +144,7 @@ impl Allocator {
             allocations,
             blocks,
             total_allocated_bytes: upstream.total_allocated_bytes,
-            total_reserved_bytes: upstream.total_reserved_bytes,
+            total_reserved_bytes: upstream.total_capacity_bytes,
         }
     }
 }

wgpu-hal/src/dx12/suballocation.rs

@@ -181,6 +181,7 @@ pub struct AllocatorReport {
     /// Sum of the memory used by all allocations, in bytes.
     pub total_allocated_bytes: u64,
     /// Sum of the memory reserved by all memory blocks including unallocated regions, in bytes.
+    // XXX: Rename to total_capacity_bytes following the rename at https://github.com/Traverse-Research/gpu-allocator/pull/266?
     pub total_reserved_bytes: u64,
 }