ggez · a1phyr · Apr 17, 2025 · Apr 16, 2025 · Apr 16, 2025
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ obj = ["obj-rs", "3d"]
 bitflags = "2.1"
 zip = { version = "0.6", default-features = false, features = ["deflate"] }
 directories = "5.0"
-wgpu = "24.0.1"
+wgpu = "25"
 glyph_brush = "0.7"
 winit = { version = "0.30", features = ["serde"] }
 image = { version = "0.25", default-features = false, features = ["gif", "png", "pnm", "tga", "tiff", "webp", "bmp", "jpeg"] }
@@ -63,16 +63,16 @@ num-traits = "0.2"
 
 [dev-dependencies]
 chrono = "0.4"
-fern = "0.6"
+fern = "0.7"
 oorandom = "11"
 argh = "0.1"
-rand = "0.8"
+rand = "0.9"
 keyframe = "1"
 keyframe_derive = "1"
 num-derive = "0.4"
 
 skeptic = { git = "https://github.com/Erk-/rust-skeptic.git", branch = "fix-rust-1-77" }
-getrandom = "0.2"
+getrandom = "0.3"
 
 [workspace]
 members = ["doc_tests"]
diff --git a/examples/04_snake.rs b/examples/04_snake.rs
@@ -363,7 +363,7 @@ impl GameState {
         let snake_pos = (GRID_SIZE.0 / 4, GRID_SIZE.1 / 2).into();
         // And we seed our RNG with the system RNG.
         let mut seed: [u8; 8] = [0; 8];
-        getrandom::getrandom(&mut seed[..]).expect("Could not create RNG seed");
+        getrandom::fill(&mut seed[..]).expect("Could not create RNG seed");
         let mut rng = Rand32::new(u64::from_ne_bytes(seed));
         // Then we choose a random place to put our piece of food using the helper we made
         // earlier.

diff --git a/examples/05_astroblasto.rs b/examples/05_astroblasto.rs
@@ -330,7 +330,7 @@ impl MainState {
 
         // Seed our RNG
         let mut seed: [u8; 8] = [0; 8];
-        getrandom::getrandom(&mut seed[..]).expect("Could not create RNG seed");
+        getrandom::fill(&mut seed[..]).expect("Could not create RNG seed");
         let mut rng = Rand32::new(u64::from_ne_bytes(seed));
 
         let assets = Assets::new(ctx)?;

diff --git a/src/graphics/context.rs b/src/graphics/context.rs
@@ -245,16 +245,14 @@ impl GraphicsContext {
             force_fallback_adapter: false,
             compatible_surface: Some(&surface),
         }))
-        .ok_or(GameError::GraphicsInitializationError)?;
+        .or(Err(GameError::GraphicsInitializationError))?;
 
         // One instance is 96 bytes, and we allow 1 million of them, for a total of 96MB (default being 128MB).
         const MAX_INSTANCES: u32 = 1_000_000;
         const INSTANCE_BUFFER_SIZE: u32 = 96 * MAX_INSTANCES;
 
-        let (device, queue) = pollster::block_on(adapter.request_device(
-            &wgpu::DeviceDescriptor {
-                label: None,
-                required_features: wgpu::Features::default(),
+        let (device, queue) =
+            pollster::block_on(adapter.request_device(&wgpu::DeviceDescriptor {
                 required_limits: wgpu::Limits {
                     // 1st: DrawParams
                     // 2nd: Texture + Sampler
@@ -268,10 +266,8 @@ impl GraphicsContext {
                     max_texture_dimension_2d: 8192,
                     ..wgpu::Limits::downlevel_webgl2_defaults()
                 },
-                memory_hints: wgpu::MemoryHints::default(),
-            },
-            None,
-        ))?;
+                ..wgpu::DeviceDescriptor::default()
+            }))?;
 
         let wgpu = Arc::new(WgpuContext {
             instance,
@@ -710,7 +706,7 @@ impl GraphicsContext {
 
     pub(crate) fn resize(&mut self, _new_size: dpi::PhysicalSize<u32>) {
         let size = self.window.inner_size();
-        let _ = self.wgpu.device.poll(wgpu::Maintain::Wait);
+        let _ = self.wgpu.device.poll(wgpu::PollType::Wait);
         self.surface_config.width = size.width.max(1);
         self.surface_config.height = size.height.max(1);
         self.wgpu

diff --git a/src/graphics/image.rs b/src/graphics/image.rs
@@ -291,7 +291,7 @@ impl Image {
         buffer
             .slice(..)
             .map_async(wgpu::MapMode::Read, move |result| tx.send(result).unwrap()); // Unwrap is fine as this should never fail
-        let _ = gfx.wgpu.device.poll(wgpu::Maintain::Wait);
+        let _ = gfx.wgpu.device.poll(wgpu::PollType::Wait);
         let map_result = rx
             .recv()
             .expect("All senders dropped, this should not be possible.");

diff --git a/src/graphics/shader.rs b/src/graphics/shader.rs
@@ -241,7 +241,7 @@ impl<'a, Uniforms: AsStd140> ShaderParamsBuilder<'a, Uniforms> {
     /// # Arguments
     ///
     /// * `vs_visible` - If the images should also be visible to the vertex shader, rather
-    ///    than just the fragment shader.
+    ///   than just the fragment shader.
     #[must_use]
     pub fn images(
         self,