From 020fb3c37794fcfa2670c3c0ada949aee95855a0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 3 Sep 2023 01:01:33 +0200
Subject: Fix `iced_wgpu` device selection on Wasm

---
 wgpu/src/window/compositor.rs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'wgpu/src/window')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index cd5b20cc..5202c7ef 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -6,8 +6,6 @@ use crate::graphics::compositor;
 use crate::graphics::{Error, Viewport};
 use crate::{Backend, Primitive, Renderer, Settings};
 
-use futures::stream::{self, StreamExt};
-
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 
 use std::marker::PhantomData;
@@ -95,14 +93,17 @@ impl<Theme> Compositor<Theme> {
         let limits =
             [wgpu::Limits::default(), wgpu::Limits::downlevel_defaults()];
 
-        let limits = limits.into_iter().map(|limits| wgpu::Limits {
-            max_bind_groups: 2,
-            ..limits
-        });
+        let mut limits = limits
+            .into_iter()
+            .map(|limits| wgpu::Limits {
+                max_bind_groups: 2,
+                ..limits
+            })
+            .into_iter();
 
-        let (device, queue) = stream::iter(limits)
-            .filter_map(|limits| async {
-                adapter.request_device(
+        let (device, queue) = loop {
+            if let Some(limits) = limits.next() {
+                let device = adapter.request_device(
                     &wgpu::DeviceDescriptor {
                         label: Some(
                             "iced_wgpu::window::compositor device descriptor",
@@ -111,11 +112,15 @@ impl<Theme> Compositor<Theme> {
                         limits,
                     },
                     None,
-                ).await.ok()
-            })
-            .boxed()
-            .next()
-            .await?;
+                ).await.ok();
+
+                if let Some(device) = device {
+                    break Some(device);
+                }
+            }
+
+            break None;
+        }?;
 
         Some(Compositor {
             instance,
-- 
cgit 


From 0b28080d3ebda4dda24c9ac9c38e3195d3499be7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 3 Sep 2023 01:05:17 +0200
Subject: Remove redundant `into_iter` call in `iced_wgpu`

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

(limited to 'wgpu/src/window')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 5202c7ef..cacfeef2 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -93,13 +93,10 @@ impl<Theme> Compositor<Theme> {
         let limits =
             [wgpu::Limits::default(), wgpu::Limits::downlevel_defaults()];
 
-        let mut limits = limits
-            .into_iter()
-            .map(|limits| wgpu::Limits {
-                max_bind_groups: 2,
-                ..limits
-            })
-            .into_iter();
+        let mut limits = limits.into_iter().map(|limits| wgpu::Limits {
+            max_bind_groups: 2,
+            ..limits
+        });
 
         let (device, queue) = loop {
             if let Some(limits) = limits.next() {
-- 
cgit 


From 9b9b37e6f83b5e5a8811feb17b484c6b11fa3b8b Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 3 Sep 2023 01:14:22 +0200
Subject: Fix adapter selection loop in `iced_wgpu`

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

(limited to 'wgpu/src/window')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index cacfeef2..9e9c63db 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -98,8 +98,9 @@ impl<Theme> Compositor<Theme> {
             ..limits
         });
 
-        let (device, queue) = loop {
-            if let Some(limits) = limits.next() {
+        let (device, queue) =
+            loop {
+                let limits = limits.next()?;
                 let device = adapter.request_device(
                     &wgpu::DeviceDescriptor {
                         label: Some(
@@ -114,10 +115,7 @@ impl<Theme> Compositor<Theme> {
                 if let Some(device) = device {
                     break Some(device);
                 }
-            }
-
-            break None;
-        }?;
+            }?;
 
         Some(Compositor {
             instance,
-- 
cgit