[d3d12 wgl] Upgrade to windows 0.59 crates

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

The latest `windows 0.59` and `windows-core 0.59` crates were
just released (strangely tagged `0.61`), including some minor code
improvements for us.  The MSRV has been bumped to `1.74`, but `wgpu` is
already on `1.76` anyway.

Author: MarijnS95

.deny.toml

@@ -22,13 +22,11 @@ skip = [
     # Deno uses an old version
     { name = "which", version = "6.0.3" },
 
-    # Loom uses a new windows version
-    { name = "windows", version = "0.61.1" },
-    { name = "windows-core", version = "0.61.2" },
-    { name = "windows-implement", version = "0.60.0" },
-    { name = "windows-interface", version = "0.59.1" },
-    { name = "windows-result", version = "0.3.4" },
-    { name = "windows-strings", version = "0.4.2" },
+    # Temporarily allow older Windows version until updates make it through
+    { name = "windows", version = "0.59" },
+    { name = "windows-core", version = "0.59" },
+    { name = "windows-implement", version = "0.59" },
+    { name = "windows-strings", version = "0.3" },
 
     # cargo-metadata uses old version. Only used for infrastructure.
     { name = "toml", version = "0.8.23" },
@@ -76,6 +74,3 @@ allow-git = [
 unknown-registry = "deny"
 unknown-git = "deny"
 required-git-spec = "rev"
-
-[sources.allow-org]
-github = ["gfx-rs"]

.github/workflows/ci.yml

@@ -746,6 +746,7 @@ jobs:
         with:
           command: check advisories
           arguments: --all-features --workspace
+          command-arguments: -Dwarnings
           rust-version: ${{ env.REPO_MSRV }}
 
   cargo-deny-check-rest:

Cargo.lock

@@ -135,7 +135,7 @@ indicatif = "0.18"
 itertools = { version = "0.14" }
 jobserver = "0.1"
 ktx2 = "0.4"
-libc = { version = "0.2.171", default-features = false }
+libc = { version = "0.2.172", default-features = false }
 # See https://github.com/rust-fuzz/libfuzzer/issues/126
 libfuzzer-sys = ">0.4.0,<=0.4.7"
 libloading = "0.8"
@@ -210,10 +210,10 @@ gpu-alloc = "0.6"
 gpu-descriptor = "0.3.2"
 
 # DX12 dependencies
-gpu-allocator = { version = "0.27", default-features = false }
+gpu-allocator = { version = "0.28", 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.58", default-features = false }
+windows-core = { version = "0.59", default-features = false }
 
 # Gles dependencies
 khronos-egl = "6"
@@ -223,7 +223,7 @@ glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
 
 # DX12 and GLES dependencies
-windows = { version = "0.58", default-features = false }
+windows = { version = "0.59", default-features = false }
 
 # wasm32 dependencies
 console_error_panic_hook = "0.1.5"
@@ -245,7 +245,7 @@ deno_webidl = "0.214.0"
 deno_webgpu = { version = "0.181.0", path = "./deno_webgpu" }
 deno_unsync = "0.4.4"
 deno_error = "0.7.0"
-tokio = "1.45.1"
+tokio = "1.47"
 termcolor = "1.1.3"
 
 # android dependencies

Cargo.toml

@@ -1,17 +1,19 @@
 use alloc::vec::Vec;
 use core::{mem, ops::Range};
 
-use windows::Win32::{
-    Foundation,
-    Graphics::{Direct3D12, Dxgi},
+use windows::{
+    core::Interface as _,
+    Win32::{
+        Foundation,
+        Graphics::{Direct3D12, Dxgi},
+    },
 };
-use windows_core::Interface;
 
 use super::conv;
 use crate::{
     auxil::{
         self,
-        dxgi::{name::ObjectExt, result::HResult as _},
+        dxgi::{name::ObjectExt as _, result::HResult as _},
     },
     dx12::borrow_interface_temporarily,
     AccelerationStructureEntries,
@@ -864,23 +866,12 @@ impl crate::CommandEncoder for super::CommandEncoder {
             if let Some(ds_view) = ds_view {
                 if flags != Direct3D12::D3D12_CLEAR_FLAGS::default() {
                     unsafe {
-                        // list.ClearDepthStencilView(
-                        //     ds_view,
-                        //     flags,
-                        //     ds.clear_value.0,
-                        //     ds.clear_value.1 as u8,
-                        //     None,
-                        // )
-                        // TODO: Replace with the above in the next breaking windows-rs release,
-                        // when https://github.com/microsoft/win32metadata/pull/1971 is in.
-                        (Interface::vtable(list).ClearDepthStencilView)(
-                            Interface::as_raw(list),
+                        list.ClearDepthStencilView(
                             ds_view,
                             flags,
                             ds.clear_value.0,
                             ds.clear_value.1 as u8,
-                            0,
-                            core::ptr::null(),
+                            None,
                         )
                     }
                 }

wgpu-hal/src/dx12/command.rs

@@ -2,8 +2,10 @@ use alloc::sync::Arc;
 use core::{ffi, ptr};
 
 use once_cell::sync::Lazy;
-use windows::Win32::{Foundation::HWND, Graphics::DirectComposition};
-use windows_core::Interface;
+use windows::{
+    core::Interface as _,
+    Win32::{Foundation::HWND, Graphics::DirectComposition},
+};
 
 use super::DynLib;
 

wgpu-hal/src/dx12/dcomp.rs

@@ -23,7 +23,7 @@ use super::{conv, descriptor, D3D12Lib};
 use crate::{
     auxil::{
         self,
-        dxgi::{name::ObjectExt, result::HResult},
+        dxgi::{name::ObjectExt as _, result::HResult as _},
     },
     dx12::{
         borrow_optional_interface_temporarily, shader_compilation, suballocation, DCompLib,

wgpu-hal/src/dx12/device.rs

@@ -1330,7 +1330,7 @@ impl crate::Surface for Surface {
                                 .ok_or(crate::SurfaceError::Other("IDXGIFactoryMedia not found"))?
                                 .CreateSwapChainForCompositionSurfaceHandle(
                                     &device.present_queue,
-                                    handle,
+                                    Some(handle),
                                     &desc,
                                     None,
                                 )

wgpu-hal/src/dx12/mod.rs

@@ -1,10 +1,11 @@
 use alloc::sync::Arc;
+
 use gpu_allocator::{d3d12::AllocationCreateDesc, MemoryLocation};
 use parking_lot::Mutex;
 use windows::Win32::Graphics::{Direct3D12, Dxgi};
 
 use crate::{
-    auxil::dxgi::{name::ObjectExt, result::HResult as _},
+    auxil::dxgi::{name::ObjectExt as _, result::HResult as _},
     dx12::conv,
 };
 
@@ -143,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

@@ -128,7 +128,7 @@ impl WglContext {
         if unsafe { OpenGL::wglGetCurrentContext() }.is_invalid() {
             return Ok(());
         }
-        unsafe { OpenGL::wglMakeCurrent(None, None) }
+        unsafe { OpenGL::wglMakeCurrent(Default::default(), Default::default()) }
     }
 }
 
@@ -382,7 +382,7 @@ fn create_instance_device() -> Result<InstanceDevice, crate::InstanceError> {
                         1,
                         None,
                         None,
-                        instance,
+                        Some(instance.into()),
                         None,
                     )
                 }
@@ -394,7 +394,7 @@ fn create_instance_device() -> Result<InstanceDevice, crate::InstanceError> {
                 })?;
                 let window = Window { window };
 
-                let dc = unsafe { Gdi::GetDC(window.window) };
+                let dc = unsafe { Gdi::GetDC(Some(window.window)) };
                 if dc.is_invalid() {
                     return Err(crate::InstanceError::with_source(
                         String::from("unable to create memory device"),
@@ -636,7 +636,7 @@ struct DeviceContextHandle {
 impl Drop for DeviceContextHandle {
     fn drop(&mut self) {
         unsafe {
-            Gdi::ReleaseDC(self.window, self.device);
+            Gdi::ReleaseDC(Some(self.window), self.device);
         };
     }
 }
@@ -672,7 +672,7 @@ impl Surface {
     ) -> Result<(), crate::SurfaceError> {
         let swapchain = self.swapchain.read();
         let sc = swapchain.as_ref().unwrap();
-        let dc = unsafe { Gdi::GetDC(self.window) };
+        let dc = unsafe { Gdi::GetDC(Some(self.window)) };
         if dc.is_invalid() {
             log::error!(
                 "unable to get the device context from window: {}",
@@ -750,7 +750,7 @@ impl crate::Surface for Surface {
         // Remove the old configuration.
         unsafe { self.unconfigure(device) };
 
-        let dc = unsafe { Gdi::GetDC(self.window) };
+        let dc = unsafe { Gdi::GetDC(Some(self.window)) };
         if dc.is_invalid() {
             log::error!(
                 "unable to get the device context from window: {}",