Merge #2991

2991: Fix compilation to iOS failed r=kvark a=grenlight Fixes wgpu#315 PR checklist: - [ ] `make` succeeds (on *nix) - [ ] `make reftests` succeeds - [x] tested examples with the following backends:metal - [ ] `rustfmt` run on changed code Co-authored-by: li jinlei <[email protected]>
gfx-rs · Sep 3, 2019 · af9088a · af9088a
2 parents 84305e0 + 4aae475
commit af9088a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/backend/vulkan/src/lib.rs b/src/backend/vulkan/src/lib.rs
@@ -28,7 +28,8 @@ extern crate winit;
     feature = "x11",
     unix,
     not(target_os = "android"),
-    not(target_os = "macos")
+    not(target_os = "macos"),
+    not(target_os = "ios")
 ))]
 extern crate x11;
 #[cfg(all(

diff --git a/src/backend/vulkan/src/window.rs b/src/backend/vulkan/src/window.rs
@@ -316,7 +316,8 @@ impl Instance {
                 feature = "x11",
                 unix,
                 not(target_os = "android"),
-                not(target_os = "macos")
+                not(target_os = "macos"),
+                not(target_os = "ios")
             ))]
             RawWindowHandle::Wayland(handle)
                 if self.extensions.contains(&khr::WaylandSurface::name()) =>
@@ -327,7 +328,8 @@ impl Instance {
                 feature = "x11",
                 unix,
                 not(target_os = "android"),
-                not(target_os = "macos")
+                not(target_os = "macos"),
+                not(target_os = "ios")
             ))]
             RawWindowHandle::X11(handle)
                 if self.extensions.contains(&khr::XlibSurface::name()) =>