From 8122904ca46b73ceda54bd73bd68cf4138d22f1b Mon Sep 17 00:00:00 2001
From: David Huculak <davidhuculak5@gmail.com>
Date: Thu, 20 Apr 2023 21:28:47 -0400
Subject: wgpu 0.16

---
 wgpu/Cargo.toml               | 4 ++--
 wgpu/src/image/atlas.rs       | 4 ++--
 wgpu/src/window/compositor.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 3478ef59..1ce07e0a 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -28,8 +28,8 @@ spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
 [dependencies]
-wgpu = "0.15"
-wgpu_glyph = "0.19"
+wgpu = "0.16"
+wgpu_glyph = "0.20"
 glyph_brush = "0.7"
 raw-window-handle = "0.5"
 log = "0.4"
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 82504147..1384949a 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -209,8 +209,8 @@ impl Atlas {
                 buffer,
                 layout: wgpu::ImageDataLayout {
                     offset: offset as u64,
-                    bytes_per_row: NonZeroU32::new(4 * image_width + padding),
-                    rows_per_image: NonZeroU32::new(image_height),
+                    bytes_per_row: Some(4 * image_width + padding),
+                    rows_per_image: Some(image_height),
                 },
             },
             wgpu::ImageCopyTexture {
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index d4a59471..8969ad6c 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -71,7 +71,7 @@ impl<Theme> Compositor<Theme> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.describe().srgb)
+                .filter(|format| format.is_srgb())
                 .copied()
                 .next()
                 .or_else(|| {
-- 
cgit 


From cbb2ba38faadc52b9523918a2fbc2e2a78de9087 Mon Sep 17 00:00:00 2001
From: David Huculak <davidhuculak5@gmail.com>
Date: Thu, 20 Apr 2023 21:38:52 -0400
Subject: remove unused import

---
 wgpu/src/image/atlas.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 1384949a..a0fdf146 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -15,8 +15,6 @@ pub const SIZE: u32 = 2048;
 use iced_graphics::image;
 use iced_graphics::Size;
 
-use std::num::NonZeroU32;
-
 #[derive(Debug)]
 pub struct Atlas {
     texture: wgpu::Texture,
-- 
cgit 


From 3f0c226b74c6d0271e550161b6542e652c1875ca Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 21 Apr 2023 21:36:30 +0200
Subject: Use point-free notation

---
 wgpu/src/window/compositor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 8969ad6c..3c51768a 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -71,8 +71,8 @@ impl<Theme> Compositor<Theme> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.is_srgb())
                 .copied()
+                .filter(wgpu::TextureFormat::is_srgb)
                 .next()
                 .or_else(|| {
                     log::warn!("No sRGB format found!");
-- 
cgit 


From cc20baad6f422271f052cf68474a4aee40dcdc82 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 21 Apr 2023 21:46:02 +0200
Subject: Use `find(..)` instead of `filter(..).next()`

---
 wgpu/src/window/compositor.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 3c51768a..53af19bf 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -72,8 +72,7 @@ impl<Theme> Compositor<Theme> {
                 .formats
                 .iter()
                 .copied()
-                .filter(wgpu::TextureFormat::is_srgb)
-                .next()
+                .find(wgpu::TextureFormat::is_srgb)
                 .or_else(|| {
                     log::warn!("No sRGB format found!");
 
-- 
cgit