feat: update to wgpu 28

Author: MendyBerger

Cargo.lock

@@ -20,8 +20,8 @@ wasmtime-wasi = "41.0"
 wasmtime-wasi-io = "41.0"
 anyhow = "1.0"
 winit = { version = "0.30", features = [ "android-native-activity" ] }
-wgpu-core = "27"
-wgpu-types = "27"
+wgpu-core = "28"
+wgpu-types = "28"
 raw-window-handle = "0.6"
 async-trait = "0.1"
 rand = "0.9"

Cargo.toml

@@ -303,6 +303,25 @@ impl From<webgpu::GpuMipmapFilterMode> for wgpu_types::FilterMode {
     }
 }
 
+// TODO: change to GpuMipmapFilterMode once in wasi:webgpu
+impl From<webgpu::GpuFilterMode> for wgpu_types::MipmapFilterMode {
+    fn from(value: webgpu::GpuFilterMode) -> Self {
+        match value {
+            webgpu::GpuFilterMode::Nearest => wgpu_types::MipmapFilterMode::Nearest,
+            webgpu::GpuFilterMode::Linear => wgpu_types::MipmapFilterMode::Linear,
+        }
+    }
+}
+
+impl From<webgpu::GpuMipmapFilterMode> for wgpu_types::MipmapFilterMode {
+    fn from(value: webgpu::GpuMipmapFilterMode) -> Self {
+        match value {
+            webgpu::GpuMipmapFilterMode::Nearest => wgpu_types::MipmapFilterMode::Nearest,
+            webgpu::GpuMipmapFilterMode::Linear => wgpu_types::MipmapFilterMode::Linear,
+        }
+    }
+}
+
 impl From<webgpu::GpuCompareFunction> for wgpu_types::CompareFunction {
     fn from(value: webgpu::GpuCompareFunction) -> Self {
         match value {

crates/wasi-webgpu-wasmtime/src/enum_conversions.rs

@@ -166,7 +166,8 @@ impl<'a> ToCore<wgpu_core::binding_model::PipelineLayoutDescriptor<'a>>
                 })
                 .collect::<Vec<_>>()
                 .into(),
-            push_constant_ranges: vec![].into(),
+            // immediate_size is not present in WebGPU
+            immediate_size: 0,
         }
     }
 }
@@ -189,8 +190,8 @@ impl<'a> ToCore<wgpu_core::pipeline::RenderPipelineDescriptor<'a>>
                 .map(|ms| ms.to_core(table))
                 .unwrap_or_default(),
             fragment: self.fragment.map(|f| f.to_core(table)),
-            // multiview and cache are not present in WebGPU
-            multiview: None,
+            // multiview_mask and cache are not present in WebGPU
+            multiview_mask: None,
             cache: None,
         }
     }
@@ -466,7 +467,7 @@ impl<'a> ToCore<wgpu_core::resource::SamplerDescriptor<'a>> for webgpu::GpuSampl
             mipmap_filter: self
                 .mipmap_filter
                 .map(|mf| mf.into())
-                .unwrap_or(wgpu_types::FilterMode::Nearest),
+                .unwrap_or(wgpu_types::MipmapFilterMode::Nearest),
             lod_min_clamp: self.lod_min_clamp.unwrap_or(0.0),
             lod_max_clamp: self.lod_max_clamp.unwrap_or(32.0),
             compare: self.compare.map(|compare| compare.into()),
@@ -600,13 +601,13 @@ impl ToCore<wgpu_types::BindingType> for webgpu::GpuStorageTextureBindingLayout
 //     }
 // }
 
-impl ToCore<wgpu_core::command::RenderPassDepthStencilAttachment>
+impl ToCore<wgpu_core::command::RenderPassDepthStencilAttachment<wgpu_core::id::TextureViewId>>
     for webgpu::GpuRenderPassDepthStencilAttachment
 {
     fn to_core(
         self,
         table: &ResourceTable,
-    ) -> wgpu_core::command::RenderPassDepthStencilAttachment {
+    ) -> wgpu_core::command::RenderPassDepthStencilAttachment<wgpu_core::id::TextureViewId> {
         fn pass_channel_from_options<V>(
             load_op: Option<webgpu::GpuLoadOp>,
             store_op: Option<webgpu::GpuStoreOp>,

crates/wasi-webgpu-wasmtime/src/to_core_conversions.rs

@@ -514,7 +514,7 @@ impl<T: WasiWebGpuView> webgpu::HostGpuDevice for WasiWebGpuImpl<T> {
                 address_modes: [wgpu_types::AddressMode::ClampToEdge; 3],
                 mag_filter: wgpu_types::FilterMode::Nearest,
                 min_filter: wgpu_types::FilterMode::Nearest,
-                mipmap_filter: wgpu_types::FilterMode::Nearest,
+                mipmap_filter: wgpu_types::MipmapFilterMode::Nearest,
                 lod_min_clamp: 0.0,
                 lod_max_clamp: 32.0,
                 compare: None,
@@ -645,7 +645,6 @@ impl<T: WasiWebGpuView> webgpu::HostGpuDevice for WasiWebGpuImpl<T> {
         let render_bundle_encoder = wgpu_core::command::RenderBundleEncoder::new(
             &descriptor.to_core(self.table()),
             device_id,
-            None,
         )
         .unwrap();
         self.table()
@@ -1082,6 +1081,8 @@ impl<T: WasiWebGpuView> webgpu::HostGpuCommandEncoder for WasiWebGpuImpl<T> {
             occlusion_query_set: descriptor
                 .occlusion_query_set
                 .map(|oqs| oqs.to_core(self.table())),
+            // multiview_mask is not present in WebGPU
+            multiview_mask: None,
             // TODO: self.max_draw_count not used
         };
         let (render_pass, err) = self
@@ -1110,6 +1111,9 @@ impl<T: WasiWebGpuView> webgpu::HostGpuCommandEncoder for WasiWebGpuImpl<T> {
                 .unwrap_or(wgpu_types::CommandBufferDescriptor::default()),
             None,
         );
+        // dropping the label.
+        // TODO: reconsider when implementing real labels.
+        let err = err.map(|(_label, err)| err);
         error_handler.handle_possible_error(err);
         self.table().push(command_buffer).unwrap()
     }

crates/wasi-webgpu-wasmtime/src/trait_impls.rs

@@ -53,6 +53,7 @@ impl HostState {
                     backend_options: Default::default(),
                     memory_budget_thresholds: Default::default(),
                 },
+                None,
             )),
             main_thread_proxy: Arc::new(main_thread_proxy),
         }