From d5453c62e9bdbf0cea030b009c41b892b700496d Mon Sep 17 00:00:00 2001
From: Elham Aryanpur <elhamaryanpur5@gmail.com>
Date: Wed, 12 Apr 2023 23:38:21 +0300
Subject: Update `wgpu` to `0.15`

---
 wgpu/Cargo.toml               |  4 ++--
 wgpu/src/image/atlas.rs       |  2 ++
 wgpu/src/triangle/msaa.rs     |  2 ++
 wgpu/src/window/compositor.rs | 25 +++++++++++++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f1e22cf6..4dcd07f7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -28,8 +28,8 @@ spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
 [dependencies]
-wgpu = "0.14"
-wgpu_glyph = "0.18"
+wgpu = "0.15"
+wgpu_glyph = "0.19"
 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 eafe2f96..82504147 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -39,6 +39,7 @@ impl Atlas {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            view_formats: &[],
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
@@ -247,6 +248,7 @@ impl Atlas {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            view_formats: &[],
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index e76f7d5e..d24f8e1a 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -222,6 +222,7 @@ impl Targets {
             sample_count,
             dimension: wgpu::TextureDimension::D2,
             format,
+            view_formats: &[],
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
         });
 
@@ -232,6 +233,7 @@ impl Targets {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format,
+            view_formats: &[],
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT
                 | wgpu::TextureUsages::TEXTURE_BINDING,
         });
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6d0c36f6..d66aca71 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -31,7 +31,10 @@ impl<Theme> Compositor<Theme> {
         settings: Settings,
         compatible_window: Option<&W>,
     ) -> Option<Self> {
-        let instance = wgpu::Instance::new(settings.internal_backend);
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+            backends: settings.internal_backend,
+            ..Default::default()
+        });
 
         log::info!("{:#?}", settings);
 
@@ -46,7 +49,7 @@ impl<Theme> Compositor<Theme> {
 
         #[allow(unsafe_code)]
         let compatible_surface = compatible_window
-            .map(|window| unsafe { instance.create_surface(window) });
+            .and_then(|window| unsafe { instance.create_surface(window).ok() });
 
         let adapter = instance
             .request_adapter(&wgpu::RequestAdapterOptions {
@@ -63,7 +66,18 @@ impl<Theme> Compositor<Theme> {
         log::info!("Selected: {:#?}", adapter.get_info());
 
         let format = compatible_surface.as_ref().and_then(|surface| {
-            surface.get_supported_formats(&adapter).first().copied()
+            surface
+                .get_capabilities(&adapter)
+                .formats
+                .iter()
+                .filter(|format| format.describe().srgb)
+                .copied()
+                .next()
+                .or_else(|| {
+                    log::warn!("No sRGB format found!");
+
+                    surface.get_capabilities(&adapter).formats.first().copied()
+                })
         })?;
 
         log::info!("Selected format: {:?}", format);
@@ -144,7 +158,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     ) -> wgpu::Surface {
         #[allow(unsafe_code)]
         unsafe {
-            self.instance.create_surface(window)
+            self.instance
+                .create_surface(window)
+                .expect("Create surface")
         }
     }
 
@@ -163,6 +179,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 width,
                 height,
                 alpha_mode: wgpu::CompositeAlphaMode::Auto,
+                view_formats: vec![],
             },
         );
     }
-- 
cgit 


From b677345ac1b1d087bc7f331c9c8c5be06933ba6e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 13 Apr 2023 05:42:56 +0200
Subject: Get surface capabilities only once in `iced_wgpu`

---
 wgpu/src/window/compositor.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index d66aca71..d4a59471 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -66,8 +66,9 @@ impl<Theme> Compositor<Theme> {
         log::info!("Selected: {:#?}", adapter.get_info());
 
         let format = compatible_surface.as_ref().and_then(|surface| {
-            surface
-                .get_capabilities(&adapter)
+            let capabilities = surface.get_capabilities(&adapter);
+
+            capabilities
                 .formats
                 .iter()
                 .filter(|format| format.describe().srgb)
@@ -76,7 +77,7 @@ impl<Theme> Compositor<Theme> {
                 .or_else(|| {
                     log::warn!("No sRGB format found!");
 
-                    surface.get_capabilities(&adapter).formats.first().copied()
+                    capabilities.formats.first().copied()
                 })
         })?;
 
-- 
cgit