me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix iced_wgpu device selection on Wasm

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-09-03 01:01:33 +02:00
parent 52b3f69e35
commit 020fb3c377
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/window/redraw_request.rs
View file

@ -13,7 +13,7 @@ pub enum RedrawRequest {
#[cfg(test)]
mod tests {
use super::*;
use std::time::{Duration, Instant};
use crate::time::{Duration, Instant};
#[test]
fn ordering() {

29
wgpu/src/window/compositor.rs
View file

@ -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 {
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,