Update deprecated wgpu structs

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pteropus"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -15,12 +15,12 @@ wgsl-shader-assembler = { git = "https://git.gordon.earth/matthew/wgsl-shader-as
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 winit = { version = "0.30.3", features = ["rwh_06"] }
-wgpu = "23.0.0"
+wgpu = "25.0.0"
 env_logger = "0.11.3"
 futures = { version = "0.3.30", features = ["executor"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wgpu = { version = "23.0.0", features = ["webgl"]}
+wgpu = { version = "25.0.0", features = ["webgl"]}
 wasm-bindgen = "0.2.84"
 wasm-bindgen-futures = "0.4.42"
 console_log = "1.0"

src/app/dem_renderer/mod.rs

@@ -427,14 +427,14 @@ fn load_dem_texture(source: &Dem, device: &wgpu::Device, queue: &wgpu::Queue) ->
     });
 
     queue.write_texture(
-        wgpu::ImageCopyTexture {
+        wgpu::TexelCopyTextureInfo {
             texture: &texture,
             mip_level: 0,
             origin: wgpu::Origin3d::ZERO,
             aspect: wgpu::TextureAspect::All,
         },
         bytemuck::cast_slice(&source.grid[..]),
-        wgpu::ImageDataLayout {
+        wgpu::TexelCopyBufferLayout {
             offset: 0,
             bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * source.num_cells_x),
             rows_per_image: Some(source.num_cells_y),
@@ -470,14 +470,14 @@ fn create_dembvh_texture(
 
     for (level, grid) in source.layers.iter().enumerate() {
         queue.write_texture(
-            wgpu::ImageCopyTexture {
+            wgpu::TexelCopyTextureInfo {
                 texture: &texture,
                 mip_level: level as u32,
                 origin: wgpu::Origin3d::ZERO,
                 aspect: wgpu::TextureAspect::All,
             },
             bytemuck::cast_slice(&grid.data[..]),
-            wgpu::ImageDataLayout {
+            wgpu::TexelCopyBufferLayout {
                 offset: 0,
                 bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * 2 * grid.size),
                 rows_per_image: Some(grid.size),

src/app/mod.rs

@@ -4,7 +4,7 @@ use crate::mvu::{Event, MvuApp, Size2i};
 use {
     log::info,
     std::{borrow::Cow, path::PathBuf},
-    wgpu::{Device, Instance, Queue, RenderPipeline, Surface, SurfaceConfiguration},
+    wgpu::{Device, Instance, Queue, RenderPipeline, Surface, SurfaceConfiguration, Trace},
 };
 
 mod dem_renderer;
@@ -62,8 +62,8 @@ impl MvuApp<Model> for App {
                     required_limits: wgpu::Limits::downlevel_webgl2_defaults()
                         .using_resolution(adapter.limits()),
                     memory_hints: wgpu::MemoryHints::MemoryUsage,
+                    trace: Trace::Off,
                 },
-                None,
             )
             .await
             .expect("Failed to create device");