Merge pull request #3097 from iced-rs/wgpu-27

Update `wgpu` to `27`

Cargo.toml

@@ -185,7 +185,7 @@ bytemuck = { version = "1.0", features = ["derive"] }
 bytes = "1.6"
 cargo-hot = { package = "cargo-hot-protocol", git = "https://github.com/hecrj/cargo-hot.git", rev = "b8dc518b8640928178a501257e353b73bc06cf47" }
 cosmic-text = "0.14"
-cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "453cedec0d2ec563bd7fa87e84a2319bcebb1ba3" }
+cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "1d68a5405986287475fd49a7793c2edd0ea41d0b" }
 futures = { version = "0.3", default-features = false }
 glam = "0.25"
 guillotiere = "0.6"
@@ -227,7 +227,7 @@ wasm-bindgen-futures = "0.4"
 wasmtimer = "0.4.1"
 web-sys = "0.3.69"
 web-time = "1.1"
-wgpu = "26.0"
+wgpu = "27.0"
 window_clipboard = "0.4.1"
 winit = { git = "https://github.com/iced-rs/winit.git", rev = "05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed" }
 

benches/wgpu.rs

@@ -39,6 +39,7 @@ pub fn wgpu_benchmark(c: &mut Criterion) {
             required_limits: wgpu::Limits::default(),
             memory_hints: wgpu::MemoryHints::MemoryUsage,
             trace: wgpu::Trace::Off,
+            experimental_features: wgpu::ExperimentalFeatures::disabled(),
         }))
         .expect("request device");
 
@@ -140,7 +141,10 @@ fn benchmark<'a>(
             &viewport,
         );
 
-        let _ = device.poll(wgpu::PollType::WaitForSubmissionIndex(submission));
+        let _ = device.poll(wgpu::PollType::Wait {
+            submission_index: Some(submission),
+            timeout: None,
+        });
 
         i += 1;
     });

examples/integration/src/main.rs

@@ -103,6 +103,8 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                                 required_limits: wgpu::Limits::default(),
                                 memory_hints: wgpu::MemoryHints::MemoryUsage,
                                 trace: wgpu::Trace::Off,
+                                experimental_features:
+                                    wgpu::ExperimentalFeatures::disabled(),
                             })
                             .await
                             .expect("Request device");

wgpu/src/image/cache.rs

@@ -128,8 +128,10 @@ impl Cache {
                     return Err(core::image::Error::OutOfMemory);
                 };
 
-                let _ = device
+                let _ = device.poll(wgpu::PollType::Wait {
-                    .poll(wgpu::PollType::WaitForSubmissionIndex(submission));
+                    submission_index: Some(submission),
+                    timeout: None,
+                });
 
                 #[allow(unsafe_code)]
                 let allocation = unsafe {
@@ -624,9 +626,10 @@ mod worker {
                 callback(&shell);
             });
 
-            let _ = self
+            let _ = self.device.poll(wgpu::PollType::Wait {
-                .device
+                submission_index: Some(submission),
-                .poll(wgpu::PollType::WaitForSubmissionIndex(submission));
+                timeout: None,
+            });
         }
     }
 }

wgpu/src/lib.rs

@@ -278,10 +278,10 @@ impl Renderer {
         let slice = output_buffer.slice(..);
         slice.map_async(wgpu::MapMode::Read, |_| {});
 
-        let _ = self
+        let _ = self.engine.device.poll(wgpu::PollType::Wait {
-            .engine
+            submission_index: Some(index),
-            .device
+            timeout: None,
-            .poll(wgpu::PollType::WaitForSubmissionIndex(index));
+        });
 
         let mapped_buffer = slice.get_mapped_range();
 
@@ -927,6 +927,7 @@ impl renderer::Headless for Renderer {
                 },
                 memory_hints: wgpu::MemoryHints::MemoryUsage,
                 trace: wgpu::Trace::Off,
+                experimental_features: wgpu::ExperimentalFeatures::disabled(),
             })
             .await
             .ok()?;

wgpu/src/window/compositor.rs

@@ -171,6 +171,8 @@ impl Compositor {
                     required_limits: required_limits.clone(),
                     memory_hints: wgpu::MemoryHints::MemoryUsage,
                     trace: wgpu::Trace::Off,
+                    experimental_features: wgpu::ExperimentalFeatures::disabled(
+                    ),
                 })
                 .await;