Skip to content

Commit a157c3c

Browse files
authored
[wgpu-hal] Migrate d3d12 backend over to windows-rs (#5956)
* windows-rs 0.58 * Clean up suspicious committed allocation workaround * dx12: Flatten suballocation module
1 parent 222f1ea commit a157c3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2465
-4691
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ By @wumpf in [#6069](https://github.com/gfx-rs/wgpu/pull/6069), [#6099](https://
8888

8989
- Replace `winapi` code in WGL wrapper to use the `windows` crate. By @MarijnS95 in [#6006](https://github.com/gfx-rs/wgpu/pull/6006)
9090

91+
#### DX12
92+
93+
- Replace `winapi` code to use the `windows` crate. By @MarijnS95 in [#5956](https://github.com/gfx-rs/wgpu/pull/5956)
94+
9195
## 22.0.0 (2024-07-17)
9296

9397
### Overview
@@ -749,7 +753,7 @@ The easiest way to make this code safe is to use shared ownership:
749753
```rust
750754
let window: Arc<winit::Window>;
751755
// ...
752-
let surface = instance.create_surface(my_window.clone())?;
756+
let surface = instance.create_surface(window.clone())?;
753757
```
754758

755759
All platform specific surface creation using points have moved into `SurfaceTargetUnsafe` as well.

Cargo.lock

Lines changed: 1 addition & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ members = [
66

77
# default members
88
"benches",
9-
"d3d12",
109
"examples",
1110
"naga-cli",
1211
"naga",
@@ -24,7 +23,6 @@ members = [
2423
exclude = []
2524
default-members = [
2625
"benches",
27-
"d3d12",
2826
"examples",
2927
"naga-cli",
3028
"naga",
@@ -96,8 +94,7 @@ indexmap = "2"
9694
itertools = { version = "0.10.5" }
9795
ktx2 = "0.3"
9896
libc = "0.2"
99-
# libloading 0.8 switches from `winapi` to `windows-sys`; permit either
100-
libloading = ">=0.7, <0.9"
97+
libloading = "0.8"
10198
libtest-mimic = "0.6"
10299
log = "0.4"
103100
nanorand = { version = "0.7", default-features = false, features = ["wyrand"] }
@@ -148,14 +145,10 @@ gpu-descriptor = "0.3"
148145

149146
# DX dependencies
150147
bit-set = "0.8"
151-
gpu-allocator = { version = "0.27", default-features = false, features = [
152-
"d3d12",
153-
"public-winapi",
154-
] }
155-
d3d12 = { version = "22.0.0", path = "./d3d12/" }
148+
gpu-allocator = { version = "0.27", default-features = false }
156149
range-alloc = "0.1"
157-
winapi = "0.3"
158150
hassle-rs = "0.11.0"
151+
windows-core = { version = "0.58", default-features = false }
159152

160153
# Gles dependencies
161154
khronos-egl = "6"

d3d12/CHANGELOG.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

d3d12/Cargo.toml

Lines changed: 0 additions & 45 deletions
This file was deleted.

d3d12/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)