Optional web-specific deps for wasm32

Author: raphaelhetzel

wgpu-core/Cargo.toml

@@ -147,7 +147,7 @@ gles = [
 ]
 
 ## WebGL backend, only available on Emscripten
-webgl = ["wgpu-core-deps-wasm/webgl"]
+webgl = ["wgpu-core-deps-wasm/webgl", "wgpu-types/web"]
 ## OpenGL backend, on macOS only
 angle = ["wgpu-core-deps-apple/angle"]
 ## Vulkan portability backend, only available on macOS

wgpu-types/Cargo.toml

@@ -37,14 +37,16 @@ alloc_instead_of_core = "warn"
 
 [features]
 default = ["std"]
-std = ["js-sys/std", "web-sys/std", "thiserror/std"]
+std = ["js-sys?/std", "web-sys?/std", "thiserror/std"]
 strict_asserts = []
 fragile-send-sync-non-atomic-wasm = []
 serde = ["dep:serde", "bitflags/serde"]
 # Enables some internal instrumentation for debugging purposes.
 counters = []
 # Enables variants of `Trace` other than `Trace::Off`
 trace = ["std"]
+# Enable web-specific dependencies for wasm.
+web = ["dep:js-sys", "dep:web-sys"]
 
 [dependencies]
 bitflags = { workspace = true, features = ["serde"] }
@@ -57,8 +59,8 @@ serde = { workspace = true, default-features = false, features = [
 ], optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = { workspace = true, default-features = false }
-web-sys = { workspace = true, default-features = false, features = [
+js-sys = { workspace = true, optional = true, default-features = false }
+web-sys = { workspace = true, optional = true, default-features = false, features = [
     "ImageBitmap",
     "ImageData",
     "HtmlImageElement",

wgpu-types/src/lib.rs

@@ -6838,7 +6838,7 @@ pub type ImageCopyTexture<T> = TexelCopyTextureInfo<T>;
 ///
 /// Corresponds to [WebGPU `GPUCopyExternalImageSourceInfo`](
 /// https://gpuweb.github.io/gpuweb/#dictdef-gpuimagecopyexternalimage).
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
 #[derive(Clone, Debug)]
 pub struct CopyExternalImageSourceInfo {
     /// The texture to be copied from. The copy source data is captured at the moment
@@ -6862,14 +6862,14 @@ pub struct CopyExternalImageSourceInfo {
     since = "24.0.0",
     note = "This has been renamed to `CopyExternalImageSourceInfo`, and will be removed in 25.0.0."
 )]
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
 pub type ImageCopyExternalImage = CopyExternalImageSourceInfo;
 
 /// Source of an external texture copy.
 ///
 /// Corresponds to the [implicit union type on WebGPU `GPUCopyExternalImageSourceInfo.source`](
 /// https://gpuweb.github.io/gpuweb/#dom-gpuimagecopyexternalimage-source).
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
 #[derive(Clone, Debug)]
 pub enum ExternalImageSource {
     /// Copy from a previously-decoded image bitmap.
@@ -6891,7 +6891,7 @@ pub enum ExternalImageSource {
     VideoFrame(web_sys::VideoFrame),
 }
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
 impl ExternalImageSource {
     /// Gets the pixel, not css, width of the source.
     pub fn width(&self) -> u32 {
@@ -6922,7 +6922,7 @@ impl ExternalImageSource {
     }
 }
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
 impl core::ops::Deref for ExternalImageSource {
     type Target = js_sys::Object;
 
@@ -6942,12 +6942,14 @@ impl core::ops::Deref for ExternalImageSource {
 
 #[cfg(all(
     target_arch = "wasm32",
+    feature = "web",
     feature = "fragile-send-sync-non-atomic-wasm",
     not(target_feature = "atomics")
 ))]
 unsafe impl Send for ExternalImageSource {}
 #[cfg(all(
     target_arch = "wasm32",
+    feature = "web",
     feature = "fragile-send-sync-non-atomic-wasm",
     not(target_feature = "atomics")
 ))]

wgpu/Cargo.toml

@@ -50,13 +50,17 @@ gles = ["wgpu-core?/gles"]
 webgpu = [
     "naga?/wgsl-out",
     "dep:wasm-bindgen-futures",
+    "dep:wasm-bindgen",
+    "dep:js-sys",
+    "dep:web-sys",
     "web-sys/Document",
     "web-sys/Event",
     "web-sys/Navigator",
     "web-sys/NodeList",
     "web-sys/Window",
     "web-sys/WorkerGlobalScope",
     "web-sys/WorkerNavigator",
+    "wgpu-types/web",
 ]
 
 #! ### Conditional Backends
@@ -68,7 +72,14 @@ angle = ["wgpu-core?/angle"]
 vulkan-portability = ["wgpu-core?/vulkan-portability"]
 
 ## Enables the GLES backend on WebAssembly only.
-webgl = ["wgpu-core/webgl", "dep:wgpu-hal", "dep:smallvec"]
+webgl = [
+    "wgpu-core/webgl",
+    "dep:wgpu-hal",
+    "dep:smallvec",
+    "dep:wasm-bindgen",
+    "dep:js-sys",
+    "dep:web-sys",
+]
 
 ## Enables the noop backend for testing.
 ##
@@ -192,9 +203,9 @@ smallvec.workspace = true
 ###############
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 # Needed for all backends
-js-sys = { workspace = true, features = ["default"] }
-wasm-bindgen.workspace = true
-web-sys = { workspace = true, features = [
+js-sys = { workspace = true, optional = true, features = ["default"] }
+wasm-bindgen = { workspace = true, optional = true }
+web-sys = { workspace = true, optional = true, features = [
     "HtmlCanvasElement",
     "OffscreenCanvas",
 ] }