diff --git a/Cargo.lock b/Cargo.lock index 2da917d60c9..9d1cb5b6f40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -665,8 +665,6 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "d3d12" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ "bitflags 2.4.1", "libloading 0.8.1", diff --git a/Cargo.toml b/Cargo.toml index bdee6f2ebcd..fee17d3d798 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,9 @@ members = [ "wgpu-types", "tests", ] -exclude = [] +exclude = [ + "d3d12", +] default-members = [ "examples/*", "player", @@ -124,7 +126,7 @@ android_system_properties = "0.1.1" # DX dependencies bit-set = "0.5" gpu-allocator = { version = "0.23", default_features = false, features = ["d3d12", "public-winapi"] } -d3d12 = "0.7.0" +d3d12 = { path = "./d3d12/" } range-alloc = "0.1" winapi = "0.3" hassle-rs = "0.10.0" diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 65221327ac5..c0d552a1709 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -100,7 +100,7 @@ hassle-rs = { version = "0.10", optional = true } glutin_wgl_sys = { version = "0.5", optional = true } winapi = { version = "0.3", features = ["profileapi", "libloaderapi", "windef", "winuser", "dcomp"] } -d3d12 = { version = "0.7", features = ["libloading"], optional = true } +d3d12 = { path = "../d3d12/", features = ["libloading"], optional = true } [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies] # backend: Metal