[d3d12 wgl] Upgrade to windows 0.62 crates

.deny.toml

@@ -22,14 +22,6 @@ 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" },
-
     # cargo-metadata uses old version. Only used for infrastructure.
     { name = "toml", version = "0.8.23" },
     { name = "ordered-float", version = "2.10.1" },
@@ -72,6 +64,9 @@ private = { ignore = true }
 [sources]
 allow-git = [
     # Waiting on releases; used in examples/tests only
+
+    # Pending a release for https://github.com/Xudong-Huang/generator-rs/pull/75
+    "https://github.com/Xudong-Huang/generator-rs",
 ]
 unknown-registry = "deny"
 unknown-git = "deny"

Cargo.toml

@@ -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,12 @@ 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.62", default-features = false }
 
 # Gles dependencies
 khronos-egl = "6"
@@ -223,7 +225,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.62", default-features = false }
 
 # wasm32 dependencies
 console_error_panic_hook = "0.1.5"
@@ -245,7 +247,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
@@ -255,6 +257,9 @@ ndk-sys = "0.6"
 [patch.crates-io]
 wgpu = { path = "./wgpu" }
 
+# https://github.com/Xudong-Huang/generator-rs/pull/75
+generator = { git = "https://github.com/Xudong-Huang/generator-rs", rev = "70b89fdabcc0e82fe84ca17f65cc52ff25e8e6de" }
+
 [profile.release]
 lto = "thin"
 debug = true

wgpu-hal/src/dx12/command.rs

@@ -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,
                         )
                     }
                 }