fixup! [wgpu-hal] Upgrade glutin to 0.31

MarijnS95 · Aug 24, 2024 · b3ba58a · b3ba58a
1 parent b8d5ae3
commit b3ba58a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -207,7 +207,7 @@ env_logger.workspace = true
 glam.workspace = true # for ray-traced-triangle example
 winit.workspace = true # for "halmark" example
 
-[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+[target.'cfg(not(any(target_arch = "wasm32", windows, target_os = "ios")))'.dev-dependencies]
 glutin-winit.workspace = true # for "raw-gles" example
 glutin.workspace = true # for "raw-gles" example
 rwh_05 = { version = "0.5", package = "raw-window-handle" } # temporary compatibility for glutin-winit in "raw-gles" example

diff --git a/wgpu-hal/examples/raw-gles.rs b/wgpu-hal/examples/raw-gles.rs
@@ -10,7 +10,7 @@
 
 extern crate wgpu_hal as hal;
 
-#[cfg(not(any(windows, target_arch = "wasm32")))]
+#[cfg(not(any(windows, target_arch = "wasm32", target_os = "ios")))]
 fn main() {
     use std::{ffi::CString, num::NonZeroU32};
 
@@ -260,8 +260,10 @@ fn main() {
     fill_screen(&exposed, 640, 400);
 }
 
-#[cfg(any(windows, all(target_arch = "wasm32", not(target_os = "emscripten"))))]
-fn main() {}
+#[cfg(any(windows, all(target_arch = "wasm32", not(target_os = "emscripten")), target_os = "ios"))]
+fn main() {
+    eprintln!("This example is not supported on on Windows and non-emscripten wasm32")
+}
 
 #[cfg(any(not(any(windows, target_arch = "wasm32")), target_os = "emscripten"))]
 fn fill_screen(exposed: &hal::ExposedAdapter<hal::api::Gles>, width: u32, height: u32) {