update wgpu to 24.0.0

raphamorim · Jan 16, 2025 · 5e4ee1b · 5e4ee1b
1 parent 15f1e74
commit 5e4ee1b
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,7 +50,7 @@ image_rs = { package = "image", version = "0.25.5", default-features = false, fe
 regex = "1.11.1"
 bytemuck = { version = "1.21.0", features = [ "derive" ] }
 serde = { version = "1.0.217", features = ["derive"] }
-wgpu = "23.0.1"
+wgpu = "24.0.0"
 libc = "0.2.169"
 smol_str = "0.3.2"
 futures = "0.3.31"

diff --git a/docs/docs/releases.md b/docs/docs/releases.md
@@ -14,15 +14,13 @@ language: 'en'
 	- OSC 7 Escape sequences to advise the terminal of the working directory.
 	- OSC 133 Escape sequence to define Input, Output and Prompt zones.
 	- OSC 1337 Escape sequences to set user vars for tracking additional shell state.
-
-## 0.2.4
-
 - Breaking: Rio now doesn't allow anymore disable kitty keyboard protocol.
 - Fullwidth semantic escape characters.
 - Fix: Relax libc requirements on ubuntu by compiling Rio in a 22.04 runner instead of 24.04 [#906](https://github.com/raphamorim/rio/pull/906) by [@marc2332](https://github.com/marc2332).
 - Fix: report of Enter/Tab/Backspace in kitty keyboard.
 - Fix: use-kitty-keyboard-protocol = true doesn't work with tmux [#599](https://github.com/raphamorim/rio/issues/599).
 - Fix: use-kitty-keyboard-protocol breaks F[5-12] on macOS [#904](https://github.com/raphamorim/rio/issues/904).
+- Update wgpu to 24.0.0.
 
 ## 0.2.3
 

diff --git a/frontends/wasm/Cargo.toml b/frontends/wasm/Cargo.toml
@@ -72,8 +72,8 @@ web-sys = { version = "0.3.62", features = [
     "GpuFrontFace",
     "GpuImageCopyBuffer",
     "GpuImageCopyExternalImage",
-    "GpuImageCopyTexture",
-    "GpuImageCopyTextureTagged",
+    "GpuTexelCopyTextureInfo",
+    "GpuTexelCopyTextureInfoTagged",
     "GpuImageDataLayout",
     "GpuIndexFormat",
     "GpuLoadOp",

diff --git a/sugarloaf/Cargo.toml b/sugarloaf/Cargo.toml
@@ -94,7 +94,7 @@ js-sys = "0.3.61"
 wasm-bindgen = "0.2.87"
 wasm-bindgen-futures = "0.4.34"
 wasm-bindgen-test = "0.3.42"
-web-sys = { version = "0.3.61", features = [
+web-sys = { version = "0.3.77", features = [
     "Location",
     "Document",
     "Navigator",
@@ -150,11 +150,11 @@ web-sys = { version = "0.3.61", features = [
     "GpuFilterMode",
     "GpuFragmentState",
     "GpuFrontFace",
-    "GpuImageCopyBuffer",
-    "GpuImageCopyExternalImage",
-    "GpuImageCopyTexture",
-    "GpuImageCopyTextureTagged",
-    "GpuImageDataLayout",
+    # "GpuImageCopyBuffer",
+    # "GpuImageCopyExternalImage",
+    # "GpuTexelCopyTextureInfo",
+    # "GpuTexelCopyTextureInfoTagged",
+    # "GpuImageDataLayout",
     "GpuIndexFormat",
     "GpuLoadOp",
     "gpu_map_mode",

diff --git a/sugarloaf/src/components/filters/runtime/luts.rs b/sugarloaf/src/components/filters/runtime/luts.rs
@@ -53,14 +53,14 @@ impl LutTexture {
         });
 
         queue.write_texture(
-            wgpu::ImageCopyTexture {
+            wgpu::TexelCopyTextureInfo {
                 texture: &texture,
                 mip_level: 0,
                 origin: wgpu::Origin3d::ZERO,
                 aspect: wgpu::TextureAspect::All,
             },
             &image.bytes,
-            wgpu::ImageDataLayout {
+            wgpu::TexelCopyBufferLayout {
                 offset: 0,
                 bytes_per_row: Some(4 * image.size.width),
                 rows_per_image: None,

diff --git a/sugarloaf/src/components/filters/runtime/mipmap.rs b/sugarloaf/src/components/filters/runtime/mipmap.rs
@@ -81,6 +81,7 @@ impl MipmapGen {
                     mip_level_count: Some(1),
                     base_array_layer: 0,
                     array_layer_count: None,
+                    ..Default::default()
                 })
             })
             .collect::<Vec<_>>();

diff --git a/sugarloaf/src/components/filters/runtime/texture.rs b/sugarloaf/src/components/filters/runtime/texture.rs
@@ -70,6 +70,7 @@ impl OwnedImage {
             mip_level_count: None,
             base_array_layer: 0,
             array_layer_count: None,
+            ..Default::default()
         });
 
         Self {

diff --git a/sugarloaf/src/components/layer/atlas.rs b/sugarloaf/src/components/layer/atlas.rs
@@ -313,15 +313,15 @@ impl Atlas {
         });
 
         encoder.copy_buffer_to_texture(
-            wgpu::ImageCopyBuffer {
+            wgpu::TexelCopyBufferInfo {
                 buffer: &buffer,
-                layout: wgpu::ImageDataLayout {
+                layout: wgpu::TexelCopyBufferLayout {
                     offset: offset as u64,
                     bytes_per_row: Some(4 * image_dimensions.0 + padding),
                     rows_per_image: Some(image_dimensions.1),
                 },
             },
-            wgpu::ImageCopyTexture {
+            wgpu::TexelCopyTextureInfo {
                 texture: &self.texture,
                 mip_level: 0,
                 origin: wgpu::Origin3d {
@@ -375,7 +375,7 @@ impl Atlas {
             }
 
             encoder.copy_texture_to_texture(
-                wgpu::ImageCopyTexture {
+                wgpu::TexelCopyTextureInfo {
                     texture: &self.texture,
                     mip_level: 0,
                     origin: wgpu::Origin3d {
@@ -385,7 +385,7 @@ impl Atlas {
                     },
                     aspect: wgpu::TextureAspect::default(),
                 },
-                wgpu::ImageCopyTexture {
+                wgpu::TexelCopyTextureInfo {
                     texture: &new_texture,
                     mip_level: 0,
                     origin: wgpu::Origin3d {

diff --git a/sugarloaf/src/components/rich_text/image_cache/cache.rs b/sugarloaf/src/components/rich_text/image_cache/cache.rs
@@ -226,7 +226,7 @@ impl ImageCache {
 
             context.queue.write_texture(
                 // Tells wgpu where to copy the pixel data
-                wgpu::ImageCopyTexture {
+                wgpu::TexelCopyTextureInfo {
                     texture: &new_texture,
                     mip_level: 0,
                     origin: wgpu::Origin3d::ZERO,
@@ -235,7 +235,7 @@ impl ImageCache {
                 // The actual pixel data
                 &self.atlas.buffer,
                 // The layout of the texture
-                wgpu::ImageDataLayout {
+                wgpu::TexelCopyBufferLayout {
                     offset: 0,
                     bytes_per_row: Some((self.max_texture_size * 4).into()),
                     rows_per_image: Some((self.max_texture_size).into()),
@@ -256,7 +256,7 @@ impl ImageCache {
 
             context.queue.write_texture(
                 // Tells wgpu where to copy the pixel data
-                wgpu::ImageCopyTexture {
+                wgpu::TexelCopyTextureInfo {
                     texture: &self.texture,
                     mip_level: 0,
                     origin: wgpu::Origin3d { x: 0, y: 0, z: 0 },
@@ -265,7 +265,7 @@ impl ImageCache {
                 // The actual pixel data
                 &self.atlas.buffer,
                 // The layout of the texture
-                wgpu::ImageDataLayout {
+                wgpu::TexelCopyBufferLayout {
                     offset: 0,
                     bytes_per_row: Some((self.max_texture_size * 4).into()),
                     rows_per_image: Some((self.max_texture_size).into()),