Merge pull request #2182 from hannobraun/wgpu

Upgrade to wgpu 0.19

.cargo/config.toml

@@ -0,0 +1,4 @@
+[build]
+# As of wgpu 0.19.1, these are necessary to build for WebGPU.
+rustflags = ["--cfg=web_sys_unstable_apis"]
+rustdocflags = ["--cfg=web_sys_unstable_apis"]

crates/fj-viewer/Cargo.toml

@@ -19,7 +19,7 @@ fj-interop.workspace = true
 fj-math.workspace = true
 nalgebra = "0.32.3"
 tobj = "4.0.1"
-raw-window-handle = "0.5.2"
+raw-window-handle = "0.6.0"
 thiserror = "1.0.53"
 tracing = "0.1.40"
 
@@ -33,7 +33,7 @@ default-features = false
 features = ["png", "jpeg"]
 
 [dependencies.wgpu]
-version = "0.18.0"
+version = "0.19.1"
 features = ["webgl"]
 
 # We don't depend on `getrandom` directly, but we need this to enable the `js`

crates/fj-viewer/src/graphics/device.rs

@@ -9,7 +9,7 @@ pub struct Device {
 impl Device {
     pub async fn from_preferred_adapter(
         instance: &wgpu::Instance,
-        surface: &wgpu::Surface,
+        surface: &wgpu::Surface<'_>,
     ) -> Result<(Self, wgpu::Adapter, wgpu::Features), DeviceError> {
         let adapter = instance
             .request_adapter(&wgpu::RequestAdapterOptions {
@@ -30,8 +30,9 @@ impl Device {
     pub async fn try_from_all_adapters(
         instance: &wgpu::Instance,
     ) -> Result<(Self, wgpu::Adapter, wgpu::Features), DeviceError> {
-        let mut all_adapters =
-            instance.enumerate_adapters(wgpu::Backends::all());
+        let mut all_adapters = instance
+            .enumerate_adapters(wgpu::Backends::all())
+            .into_iter();
 
         let result = loop {
             let Some(adapter) = all_adapters.next() else {
@@ -67,7 +68,7 @@ impl Device {
     pub async fn new(
         adapter: &wgpu::Adapter,
     ) -> Result<(Self, wgpu::Features), DeviceError> {
-        let features = {
+        let required_features = {
             let desired_features = wgpu::Features::POLYGON_MODE_LINE;
             let available_features = adapter.features();
 
@@ -82,7 +83,7 @@ impl Device {
             desired_features.intersection(available_features)
         };
 
-        let limits = {
+        let required_limits = {
             // This is the lowest of the available defaults. It should guarantee
             // that we can run pretty much everywhere.
             let lowest_limits = wgpu::Limits::downlevel_webgl2_defaults();
@@ -98,14 +99,14 @@ impl Device {
             .request_device(
                 &wgpu::DeviceDescriptor {
                     label: None,
-                    features,
-                    limits,
+                    required_features,
+                    required_limits,
                 },
                 None,
             )
             .await?;
 
-        Ok((Device { device, queue }, features))
+        Ok((Device { device, queue }, required_features))
     }
 }