diff --git a/Cargo.lock b/Cargo.lock index a7bdbbe6b8..618a781527 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -815,8 +815,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 2123e89e75..2141e8cab1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,9 @@ members = [ "wgpu-types", "wgpu", ] -exclude = [] +exclude = [ + "d3d12", +] default-members = [ "examples/*", "naga", @@ -136,7 +138,7 @@ gpu-allocator = { version = "0.23", default_features = false, features = [ "d3d12", "public-winapi", ] } -d3d12 = "0.7.0" +d3d12 = { version = "0.7.0", path = "./d3d12/" } range-alloc = "0.1" winapi = "0.3" hassle-rs = "0.10.0" @@ -175,7 +177,6 @@ termcolor = "1.3.0" [patch.crates-io] #glow = { path = "../glow" } -#d3d12 = { path = "../d3d12-rs" } #web-sys = { path = "../wasm-bindgen/crates/web-sys" } #js-sys = { path = "../wasm-bindgen/crates/js-sys" } #wasm-bindgen = { path = "../wasm-bindgen" } diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 813fc70122..02d4d27606 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -138,7 +138,7 @@ winapi = { version = "0.3", features = [ "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