Let wgpu decide whether to support renderdoc, not wgpu-core.

gfx-rs · Dec 2, 2022 · 259317d · 259317d
1 parent 3711c49
commit 259317d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -25,6 +25,10 @@ gles = ["hal/gles"]
 dx11 = ["hal/dx11"]
 dx12 = ["hal/dx12"]
 
+# Support the Renderdoc graphics debugger:
+# https://renderdoc.org/
+renderdoc = ["hal/renderdoc"]
+
 # Apply run-time checks, even in release builds. These are in addition
 # to the validation carried out at public APIs in all builds.
 strict_asserts = []
@@ -68,11 +72,5 @@ workspace = true
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 web-sys = { workspace = true, features = ["HtmlCanvasElement", "OffscreenCanvas"] }
 
-[target.'cfg(all(not(target_arch = "wasm32"), unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
-hal = { workspace = true, features = ["renderdoc"] }
-
-[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
-hal = { workspace = true, features = ["renderdoc"] }
-
 [target.'cfg(target_os = "emscripten")'.dependencies]
 hal = { workspace = true, features = ["emscripten"] }
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -123,8 +123,14 @@ features = ["vulkan"]
 workspace = true
 
 # We need wgpu-hal unless we're targeting the web APIs.
-[target.'cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))'.dependencies.hal]
-workspace = true
+[target.'cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))'.dependencies]
+hal = { workspace = true }
+
+[target.'cfg(all(not(target_arch = "wasm32"), unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
+hal = { workspace = true, features = ["renderdoc"] }
+
+[target.'cfg(windows)'.dependencies]
+hal = { workspace = true, features = ["renderdoc"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.hal]
 workspace = true