WIP: chore!: update web-sys to rustwasm/wasm-bindgen#3816

TODO: merge PR in upstream, consume the "good" way here

Author: ErichDonGubler

Cargo.lock

@@ -183,9 +183,10 @@ termcolor = "1.4.1"
 
 [patch.crates-io]
 #glow = { path = "../glow" }
-#web-sys = { path = "../wasm-bindgen/crates/web-sys" }
-#js-sys = { path = "../wasm-bindgen/crates/js-sys" }
-#wasm-bindgen = { path = "../wasm-bindgen" }
+# Merge commit generated from <https://github.com/rustwasm/wasm-bindgen/pull/3816>.
+web-sys = { version = "0.3.67", git = "https://github.com/rustwasm/wasm-bindgen", rev = "b1047882dcc3ac984485a518b1899670efcc3aa8" }
+js-sys = { version = "0.3.67", git = "https://github.com/rustwasm/wasm-bindgen", rev = "b1047882dcc3ac984485a518b1899670efcc3aa8" }
+wasm-bindgen = { version = "0.2.9", git = "https://github.com/rustwasm/wasm-bindgen", rev = "b1047882dcc3ac984485a518b1899670efcc3aa8" }
 
 # Speed up image comparison even in debug builds
 [profile.dev.package."nv-flip-sys"]

Cargo.toml

@@ -372,11 +372,9 @@ fn map_stencil_state_face(desc: &wgt::StencilFaceState) -> web_sys::GpuStencilFa
 }
 
 fn map_depth_stencil_state(desc: &wgt::DepthStencilState) -> web_sys::GpuDepthStencilState {
-    let mut mapped = web_sys::GpuDepthStencilState::new(
-        map_compare_function(desc.depth_compare),
-        desc.depth_write_enabled,
-        map_texture_format(desc.format),
-    );
+    let mut mapped = web_sys::GpuDepthStencilState::new(map_texture_format(desc.format));
+    mapped.depth_write_enabled(desc.depth_write_enabled);
+    mapped.depth_compare(map_compare_function(desc.depth_compare));
     mapped.depth_bias(desc.bias.constant);
     mapped.depth_bias_clamp(desc.bias.clamp);
     mapped.depth_bias_slope_scale(desc.bias.slope_scale);
@@ -1689,8 +1687,8 @@ impl crate::context::Context for ContextWebGpu {
     ) -> (Self::RenderPipelineId, Self::RenderPipelineData) {
         let module: &<ContextWebGpu as crate::Context>::ShaderModuleData =
             downcast_ref(desc.vertex.module.data.as_ref());
-        let mut mapped_vertex_state =
-            web_sys::GpuVertexState::new(desc.vertex.entry_point, &module.0);
+        let mut mapped_vertex_state = web_sys::GpuVertexState::new(&module.0);
+        mapped_vertex_state.entry_point(desc.vertex.entry_point);
 
         let buffers = desc
             .vertex
@@ -1764,8 +1762,8 @@ impl crate::context::Context for ContextWebGpu {
                 .collect::<js_sys::Array>();
             let module: &<ContextWebGpu as crate::Context>::ShaderModuleData =
                 downcast_ref(frag.module.data.as_ref());
-            let mapped_fragment_desc =
-                web_sys::GpuFragmentState::new(frag.entry_point, &module.0, &targets);
+            let mapped_fragment_desc = web_sys::GpuFragmentState::new(&module.0, &targets);
+            mapped_fragment_desc.entry_point(frag.entry_point);
             mapped_desc.fragment(&mapped_fragment_desc);
         }
 
@@ -1789,8 +1787,8 @@ impl crate::context::Context for ContextWebGpu {
     ) -> (Self::ComputePipelineId, Self::ComputePipelineData) {
         let shader_module: &<ContextWebGpu as crate::Context>::ShaderModuleData =
             downcast_ref(desc.module.data.as_ref());
-        let mapped_compute_stage =
-            web_sys::GpuProgrammableStage::new(desc.entry_point, &shader_module.0);
+        let mapped_compute_stage = web_sys::GpuProgrammableStage::new(&shader_module.0);
+        mapped_compute_stage.entry_point(desc.entry_point);
         let auto_layout = wasm_bindgen::JsValue::from(web_sys::GpuAutoLayoutMode::Auto);
         let mut mapped_desc = web_sys::GpuComputePipelineDescriptor::new(
             &match desc.layout {