update wgpu 24.0.0

mitoma · Jan 20, 2025 · eaf2cc9 · eaf2cc9
1 parent a13ca19
commit eaf2cc9
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ resolver = "2"
 
 [workspace.dependencies]
 thiserror = "2.0"
-wgpu = "23.0.0"
+wgpu = "24.0.0"
 # fork元は winit = "0.29.x" ブランチ。いくつかのパッチを当てたものを使っている。
 # patch-1
 #   wasm で ime support が十分でないのでパッチを当てている。

diff --git a/font_rasterizer/src/screen_texture.rs b/font_rasterizer/src/screen_texture.rs
@@ -85,14 +85,14 @@ impl BackgroundImageTexture {
         });
 
         queue.write_texture(
-            wgpu::ImageCopyTexture {
+            wgpu::TexelCopyTextureInfo {
                 texture: &texture,
                 mip_level: 0,
                 origin: wgpu::Origin3d::ZERO,
                 aspect: wgpu::TextureAspect::All,
             },
             &diffuse_rgba,
-            wgpu::ImageDataLayout {
+            wgpu::TexelCopyBufferLayout {
                 offset: 0,
                 bytes_per_row: Some(4 * width),
                 rows_per_image: Some(height),

diff --git a/ui_support/src/lib.rs b/ui_support/src/lib.rs
@@ -278,6 +278,9 @@ pub async fn run_support(support: SimpleStateSupport) {
                                         Err(wgpu::SurfaceError::Timeout) => {
                                             log::warn!("Surface timeout")
                                         }
+                                        Err(wgpu::SurfaceError::Other) => {
+                                            log::warn!("Surface Other error")
+                                        }
                                     }
                                     // 1 フレームごとに時計を更新する(時計のモードが StepByStep の場合のみ意味がある)
                                     increment_fixed_clock(Duration::ZERO);

diff --git a/ui_support/src/render_state.rs b/ui_support/src/render_state.rs
@@ -96,15 +96,15 @@ impl RenderTarget {
                 let size = context.window_size;
                 let u32_size = std::mem::size_of::<u32>() as u32;
                 encoder.copy_texture_to_buffer(
-                    wgpu::ImageCopyTexture {
+                    wgpu::TexelCopyTextureInfo {
                         aspect: wgpu::TextureAspect::All,
                         texture: surface_texture,
                         mip_level: 0,
                         origin: wgpu::Origin3d::ZERO,
                     },
-                    wgpu::ImageCopyBuffer {
+                    wgpu::TexelCopyBufferInfo {
                         buffer: output_buffer,
-                        layout: wgpu::ImageDataLayout {
+                        layout: wgpu::TexelCopyBufferLayout {
                             offset: 0,
                             bytes_per_row: Some(u32_size * size.width),
                             rows_per_image: Some(size.height),
@@ -191,7 +191,7 @@ impl RenderState {
 
         // The instance is a handle to our GPU
         // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
-        let instance = wgpu::Instance::new(InstanceDescriptor::default());
+        let instance = wgpu::Instance::new(&InstanceDescriptor::default());
 
         let surface = match &render_target_request {
             RenderTargetRequest::Window { window } => {