Skip to content

Commit f4c12d2

Browse files
committed
Make renderdoc no-op on WASM
1 parent 0f5a3c8 commit f4c12d2

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

wgpu-hal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ thiserror = "1"
6262
arrayvec = "0.7"
6363
fxhash = "0.2.1"
6464
log = "0.4"
65-
renderdoc-sys = { version = "1.0.0", optional = true }
6665

6766
# backend: Gles
6867
glow = { version = "0.12.1", optional = true }
@@ -81,6 +80,7 @@ smallvec = { version = "1", optional = true, features = ["union"] }
8180

8281
egl = { package = "khronos-egl", version = "4.1", features = ["dynamic"], optional = true }
8382
libloading = { version = "0.7", optional = true }
83+
renderdoc-sys = { version = "1.0.0", optional = true }
8484

8585
[target.'cfg(target_os = "emscripten")'.dependencies]
8686
egl = { package = "khronos-egl", version = "4.1", features = ["static", "no-pkg-config"] }

wgpu-hal/src/auxil/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[cfg(all(any(feature = "dx11", feature = "dx12"), windows))]
22
pub(super) mod dxgi;
33

4-
#[cfg(feature = "renderdoc")]
4+
#[cfg(all(not(target_arch = "wasm32"), feature = "renderdoc"))]
55
pub(super) mod renderdoc;
66

77
pub mod db {

wgpu-hal/src/gles/adapter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ impl crate::Adapter<super::Api> for super::Adapter {
660660
device: super::Device {
661661
shared: Arc::clone(&self.shared),
662662
main_vao,
663-
#[cfg(feature = "renderdoc")]
663+
#[cfg(all(not(target_arch = "wasm32"), feature = "renderdoc"))]
664664
render_doc: Default::default(),
665665
},
666666
queue: super::Queue {

wgpu-hal/src/gles/device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ impl crate::Device<super::Api> for super::Device {
13011301
}
13021302

13031303
unsafe fn start_capture(&self) -> bool {
1304-
#[cfg(feature = "renderdoc")]
1304+
#[cfg(all(not(target_arch = "wasm32"), feature = "renderdoc"))]
13051305
return unsafe {
13061306
self.render_doc
13071307
.start_frame_capture(self.shared.context.raw_context(), ptr::null_mut())
@@ -1310,7 +1310,7 @@ impl crate::Device<super::Api> for super::Device {
13101310
false
13111311
}
13121312
unsafe fn stop_capture(&self) {
1313-
#[cfg(feature = "renderdoc")]
1313+
#[cfg(all(not(target_arch = "wasm32"), feature = "renderdoc"))]
13141314
unsafe {
13151315
self.render_doc
13161316
.end_frame_capture(ptr::null_mut(), ptr::null_mut())

wgpu-hal/src/gles/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ pub struct Adapter {
211211
pub struct Device {
212212
shared: Arc<AdapterShared>,
213213
main_vao: glow::VertexArray,
214-
#[cfg(feature = "renderdoc")]
214+
#[cfg(all(not(target_arch = "wasm32"), feature = "renderdoc"))]
215215
render_doc: crate::auxil::renderdoc::RenderDoc,
216216
}
217217

0 commit comments

Comments
 (0)