Try to fix emscripten build

gfx-rs · Jun 6, 2022 · 0a1e816 · 0a1e816
1 parent c2cba40
commit 0a1e816
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
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"))]
+    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "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"))]
+    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "emscripten")))]
     pub fn create_surface_webgl_offscreen_canvas(
         &self,
         canvas: &web_sys::OffscreenCanvas,

diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
@@ -181,7 +181,7 @@ impl Context {
         }
     }
 
-    #[cfg(all(target_arch = "wasm32", feature = "webgl"))]
+    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "emscripten")))]
     pub fn instance_create_surface_from_canvas(
         self: &Arc<Self>,
         canvas: &web_sys::HtmlCanvasElement,
@@ -193,7 +193,7 @@ impl Context {
         }
     }
 
-    #[cfg(all(target_arch = "wasm32", feature = "webgl"))]
+    #[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "emscripten")))]
     pub fn instance_create_surface_from_offscreen_canvas(
         self: &Arc<Self>,
         canvas: &web_sys::OffscreenCanvas,

diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
@@ -1739,7 +1739,7 @@ impl Instance {
     /// # Safety
     ///
     /// - canvas must be a valid <canvas> element to create a surface upon.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(all(target_arch = "wasm32", not(feature = "emscripten")))]
     pub fn create_surface_from_canvas(&self, canvas: &web_sys::HtmlCanvasElement) -> Surface {
         Surface {
             context: Arc::clone(&self.context),
@@ -1752,7 +1752,7 @@ impl Instance {
     /// # Safety
     ///
     /// - canvas must be a valid OffscreenCanvas to create a surface upon.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(all(target_arch = "wasm32", not(feature = "emscripten")))]
     pub fn create_surface_from_offscreen_canvas(
         &self,
         canvas: &web_sys::OffscreenCanvas,