Remove webgl feature from wgpu-core as webgl is the only wasm32 bac…

…kend
gfx-rs · Jun 6, 2022 · 95ca719 · 95ca719
1 parent 158c416
commit 95ca719
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -22,7 +22,6 @@ replay = ["serde", "wgt/replay", "arrayvec/serde", "naga/deserialize"]
 serial-pass = ["serde", "wgt/serde", "arrayvec/serde"]
 id32 = []
 vulkan-portability = ["hal/vulkan"]
-webgl = ["web-sys"]
 
 [dependencies]
 arrayvec = "0.7"
@@ -59,7 +58,7 @@ version = "0.12"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.12", features = ["gles"] }
-web-sys = { version = "0.3", features = ["HtmlCanvasElement"], optional = true }
+web-sys = { version = "0.3", features = ["HtmlCanvasElement"] }
 
 [target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
 hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.12", features = ["metal"] }

diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs
@@ -493,7 +493,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         id.0
     }
 
-    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(target_os = "emscripten")))]
+    #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
     pub fn create_surface_webgl_canvas(
         &self,
         canvas: &web_sys::HtmlCanvasElement,
@@ -516,7 +516,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         id.0
     }
 
-    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(target_os = "emscripten")))]
+    #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
     pub fn create_surface_webgl_offscreen_canvas(
         &self,
         canvas: &web_sys::OffscreenCanvas,

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -82,7 +82,7 @@ glsl = ["naga/glsl-in"]
 trace = ["serde", "wgc/trace"]
 replay = ["serde", "wgc/replay"]
 angle = ["wgc/angle"]
-webgl = ["wgc", "wgc/webgl"]
+webgl = ["wgc"]
 emscripten = ["webgl"]
 vulkan-portability = ["wgc/vulkan-portability"]