Skip to content

Commit

Permalink
Remove DX11 backend (gfx-rs#4828)
Browse files Browse the repository at this point in the history
  • Loading branch information
valaphee authored and bradwerth committed Dec 8, 2023
1 parent fdc2eeb commit 7cdc3e1
Show file tree
Hide file tree
Showing 30 changed files with 28 additions and 1,297 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Bottom level categories:
- DX12
- Vulkan
- Metal
- DX11
- GLES
- WebGPU
- Emscripten
Expand All @@ -40,6 +39,10 @@ Bottom level categories:

## Unreleased

### Direct3D 11 backend removal

This backend had no functionality, and with the recent support for GL on Desktop, which allows wgpu to run on older devices, there is no need to keep the backend.

### `WGPU_ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER` environment variable

This adds a way to allow a Vulkan driver which is non-compliant per VK_KHR_driver_properties to be enumerated. This is intended for testing new Vulkan drivers which are not Vulkan compliant yet.
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ We have a [wiki](https://github.com/gfx-rs/wgpu/wiki) that serves as a knowledge
| ----------- | ------------------------------ | ------------------ | ------------------------- | ------------------------- |
| Vulkan | :white_check_mark: | :white_check_mark: | :volcano: | |
| Metal | | | :white_check_mark: | |
| DX12 | :white_check_mark: | | | |
| DX11 | :hammer_and_wrench: | | | |
| DX12 | :white_check_mark: | | | |
| OpenGL | :ok: (GL 3.3+) | :ok: (GL ES 3.0+) | :triangular_ruler: | :ok: (WebGL2) |
| WebGPU | | | | :white_check_mark: |

Expand Down Expand Up @@ -138,7 +137,7 @@ determined by the value of `MINIMUM_RUST_VERSION` in
All testing and example infrastructure share the same set of environment variables that determine which Backend/GPU it will run on.

- `WGPU_ADAPTER_NAME` with a substring of the name of the adapter you want to use (ex. `1080` will match `NVIDIA GeForce 1080ti`).
- `WGPU_BACKEND` with a comma-separated list of the backends you want to use (`vulkan`, `metal`, `dx12`, `dx11`, or `gl`).
- `WGPU_BACKEND` with a comma-separated list of the backends you want to use (`vulkan`, `metal`, `dx12`, or `gl`).
- `WGPU_POWER_PREF` with the power preference to choose when a specific adapter name isn't specified (`high`, `low` or `none`)
- `WGPU_DX12_COMPILER` with the DX12 shader compiler you wish to use (`dxc` or `fxc`, note that `dxc` requires `dxil.dll` and `dxcompiler.dll` to be in the working directory otherwise it will fall back to `fxc`)
- `WGPU_GLES_MINOR_VERSION` with the minor OpenGL ES 3 version number to request (`0`, `1`, `2` or `automatic`).
Expand Down
4 changes: 2 additions & 2 deletions deno_webgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ features = ["trace", "replay", "serde", "strict_asserts", "wgsl", "gles"]
workspace = true
features = ["metal"]

# We want the wgpu-core Direct3D backends on Windows.
# We want the wgpu-core Direct3D backend on Windows.
[target.'cfg(windows)'.dependencies.wgpu-core]
workspace = true
features = ["dx11", "dx12"]
features = ["dx12"]

[target.'cfg(windows)'.dependencies.wgpu-hal]
version = "0.18.0"
Expand Down
2 changes: 0 additions & 2 deletions deno_webgpu/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ mod macros {
wgpu_types::Backend::Metal => $global.$method::<wgpu_core::api::Metal>( $($param),* ),
#[cfg(all(not(target_arch = "wasm32"), windows))]
wgpu_types::Backend::Dx12 => $global.$method::<wgpu_core::api::Dx12>( $($param),* ),
#[cfg(all(not(target_arch = "wasm32"), windows))]
wgpu_types::Backend::Dx11 => $global.$method::<wgpu_core::api::Dx11>( $($param),* ),
#[cfg(any(
all(unix, not(target_os = "macos"), not(target_os = "ios")),
feature = "angle",
Expand Down
Binary file modified etc/big-picture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion etc/big-picture.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="app.diagrams.net" modified="2021-08-19T17:35:17.223Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="9cv9qMgzU62vDfrDVqXC" version="14.4.8" type="device"><diagram id="FLHi6BIjYAkfD6NTjxEH" name="Page-1">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</diagram></mxfile>
<mxfile host="app.diagrams.net" modified="2023-12-04T19:38:59.956Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) Gecko/20100101 Firefox/120.0" etag="ZvsPE6AT2WA2xAhdKlfq" version="22.1.5" type="device"><diagram id="FLHi6BIjYAkfD6NTjxEH" name="Page-1">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</diagram></mxfile>
2 changes: 1 addition & 1 deletion player/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ features = ["replay"]

[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
workspace = true
features = ["replay", "raw-window-handle", "strict_asserts", "wgsl", "metal", "dx11", "dx12", "vulkan", "gles"]
features = ["replay", "raw-window-handle", "strict_asserts", "wgsl", "metal", "dx12", "vulkan", "gles"]

[dev-dependencies]
serde.workspace = true
2 changes: 1 addition & 1 deletion player/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ play <trace-dir>

When built with "winit" feature, it's able to replay the workloads that operate on a swapchain. It renders each frame sequentially and then waits for the user to close the window. When built without "winit", it launches in console mode and can replay any trace that doesn't use swapchains.

Note: replaying is currently restricted to the same backend as one used for recording a trace. It is straightforward, however, to just replace the backend in RON since it's serialized as plain text. Valid values are: Vulkan, Metal, Dx12, and Dx11.
Note: replaying is currently restricted to the same backend as one used for recording a trace. It is straightforward, however, to just replace the backend in RON since it's serialized as plain text. Valid values are: Vulkan, Metal, and Dx12.
2 changes: 0 additions & 2 deletions player/tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ impl Test<'_> {
wgt::Backend::Vulkan => "Vulkan",
wgt::Backend::Metal => "Metal",
wgt::Backend::Dx12 => "Dx12",
wgt::Backend::Dx11 => "Dx11",
wgt::Backend::Gl => "Gl",
_ => unreachable!(),
};
Expand Down Expand Up @@ -170,7 +169,6 @@ const BACKENDS: &[wgt::Backend] = &[
wgt::Backend::Vulkan,
wgt::Backend::Metal,
wgt::Backend::Dx12,
wgt::Backend::Dx11,
wgt::Backend::Gl,
];

Expand Down
2 changes: 1 addition & 1 deletion tests/src/expectations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/// ```
/// # use wgpu_test::*;
/// FailureCase {
/// backends: Some(wgpu::Backends::DX11 | wgpu::Backends::DX12),
/// backends: Some(wgpu::Backends::DX12),
/// vendor: None,
/// adapter: Some("RTX"),
/// driver: None,
Expand Down
1 change: 0 additions & 1 deletion wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ resource_log_info = []
metal = ["hal/metal"]
vulkan = ["hal/vulkan"]
gles = ["hal/gles"]
dx11 = ["hal/dx11"]
dx12 = ["hal/dx12"]

# Use static linking for libraries. Disale to manually link. Enabled by default.
Expand Down
4 changes: 0 additions & 4 deletions wgpu-core/src/any_surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ impl AnySurface {
if self.downcast_ref::<hal::api::Dx12>().is_some() {
return Backend::Dx12;
}
#[cfg(all(feature = "dx11", windows))]
if self.downcast_ref::<hal::api::Dx11>().is_some() {
return Backend::Dx11;
}
#[cfg(feature = "gles")]
if self.downcast_ref::<hal::api::Gles>().is_some() {
return Backend::Gl;
Expand Down
5 changes: 0 additions & 5 deletions wgpu-core/src/device/global.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2178,11 +2178,6 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
all_queue_empty =
self.poll_device::<hal::api::Dx12>(force_wait, &mut closures)? && all_queue_empty;
}
#[cfg(all(feature = "dx11", windows))]
{
all_queue_empty =
self.poll_device::<hal::api::Dx11>(force_wait, &mut closures)? && all_queue_empty;
}
#[cfg(feature = "gles")]
{
all_queue_empty =
Expand Down
14 changes: 0 additions & 14 deletions wgpu-core/src/global.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ pub struct GlobalReport {
pub metal: Option<HubReport>,
#[cfg(all(feature = "dx12", windows))]
pub dx12: Option<HubReport>,
#[cfg(all(feature = "dx11", windows))]
pub dx11: Option<HubReport>,
#[cfg(feature = "gles")]
pub gl: Option<HubReport>,
}
Expand All @@ -40,8 +38,6 @@ impl GlobalReport {
Backend::Metal => self.metal.as_ref().unwrap(),
#[cfg(all(feature = "dx12", windows))]
Backend::Dx12 => self.dx12.as_ref().unwrap(),
#[cfg(all(feature = "dx11", windows))]
Backend::Dx11 => self.dx11.as_ref().unwrap(),
#[cfg(feature = "gles")]
Backend::Gl => self.gl.as_ref().unwrap(),
_ => panic!("HubReport is not supported on this backend"),
Expand Down Expand Up @@ -132,12 +128,6 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
} else {
None
},
#[cfg(all(feature = "dx11", windows))]
dx11: if self.instance.dx11.is_some() {
Some(self.hubs.dx11.generate_report())
} else {
None
},
#[cfg(feature = "gles")]
gl: if self.instance.gl.is_some() {
Some(self.hubs.gl.generate_report())
Expand Down Expand Up @@ -167,10 +157,6 @@ impl<G: GlobalIdentityHandlerFactory> Drop for Global<G> {
{
self.hubs.dx12.clear(&surfaces_locked, true);
}
#[cfg(all(feature = "dx11", windows))]
{
self.hubs.dx11.clear(&surfaces_locked, true);
}
#[cfg(feature = "gles")]
{
self.hubs.gl.clear(&surfaces_locked, true);
Expand Down
21 changes: 0 additions & 21 deletions wgpu-core/src/hal_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,6 @@ impl HalApi for hal::api::Dx12 {
}
}

#[cfg(all(feature = "dx11", windows))]
impl HalApi for hal::api::Dx11 {
const VARIANT: Backend = Backend::Dx11;
fn create_instance_from_hal(name: &str, hal_instance: Self::Instance) -> Instance {
Instance {
name: name.to_owned(),
dx11: Some(hal_instance),
..Default::default()
}
}
fn instance_as_hal(instance: &Instance) -> Option<&Self::Instance> {
instance.dx11.as_ref()
}
fn hub<G: GlobalIdentityHandlerFactory>(global: &Global<G>) -> &Hub<Self> {
&global.hubs.dx11
}
fn get_surface(surface: &Surface) -> Option<&HalSurface<Self>> {
surface.raw.downcast_ref()
}
}

#[cfg(feature = "gles")]
impl HalApi for hal::api::Gles {
const VARIANT: Backend = Backend::Gl;
Expand Down
Loading

0 comments on commit 7cdc3e1

Please sign in to comment.