Skip to content

Commit

Permalink
[wgpu-hal] Migrate d3d12 backend over to windows-rs (#5956)
Browse files Browse the repository at this point in the history
* windows-rs 0.58

* Clean up suspicious committed allocation workaround

* dx12: Flatten suballocation module
  • Loading branch information
MarijnS95 authored Aug 20, 2024
1 parent 222f1ea commit a157c3c
Show file tree
Hide file tree
Showing 42 changed files with 2,465 additions and 4,691 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ By @wumpf in [#6069](https://github.com/gfx-rs/wgpu/pull/6069), [#6099](https://

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

#### DX12

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

## 22.0.0 (2024-07-17)

### Overview
Expand Down Expand Up @@ -749,7 +753,7 @@ The easiest way to make this code safe is to use shared ownership:
```rust
let window: Arc<winit::Window>;
// ...
let surface = instance.create_surface(my_window.clone())?;
let surface = instance.create_surface(window.clone())?;
```

All platform specific surface creation using points have moved into `SurfaceTargetUnsafe` as well.
Expand Down
13 changes: 1 addition & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 3 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ members = [

# default members
"benches",
"d3d12",
"examples",
"naga-cli",
"naga",
Expand All @@ -24,7 +23,6 @@ members = [
exclude = []
default-members = [
"benches",
"d3d12",
"examples",
"naga-cli",
"naga",
Expand Down Expand Up @@ -96,8 +94,7 @@ indexmap = "2"
itertools = { version = "0.10.5" }
ktx2 = "0.3"
libc = "0.2"
# libloading 0.8 switches from `winapi` to `windows-sys`; permit either
libloading = ">=0.7, <0.9"
libloading = "0.8"
libtest-mimic = "0.6"
log = "0.4"
nanorand = { version = "0.7", default-features = false, features = ["wyrand"] }
Expand Down Expand Up @@ -148,14 +145,10 @@ gpu-descriptor = "0.3"

# DX dependencies
bit-set = "0.8"
gpu-allocator = { version = "0.27", default-features = false, features = [
"d3d12",
"public-winapi",
] }
d3d12 = { version = "22.0.0", path = "./d3d12/" }
gpu-allocator = { version = "0.27", default-features = false }
range-alloc = "0.1"
winapi = "0.3"
hassle-rs = "0.11.0"
windows-core = { version = "0.58", default-features = false }

# Gles dependencies
khronos-egl = "6"
Expand Down
32 changes: 0 additions & 32 deletions d3d12/CHANGELOG.md

This file was deleted.

45 changes: 0 additions & 45 deletions d3d12/Cargo.toml

This file was deleted.

5 changes: 0 additions & 5 deletions d3d12/README.md

This file was deleted.

Loading

0 comments on commit a157c3c

Please sign in to comment.