From cd12d416271e9e9fd0f00303525021f75688ff9f Mon Sep 17 00:00:00 2001
From: Leo Kettmeir <crowlkats@toaxl.com>
Date: Sun, 5 May 2024 07:22:18 -0700
Subject: chore: update wgpu (#23684)

---
 ext/webgpu/compute_pass.rs | 55 +++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

(limited to 'ext/webgpu/compute_pass.rs')

diff --git a/ext/webgpu/compute_pass.rs b/ext/webgpu/compute_pass.rs
index a2c740a0d..17043c767 100644
--- a/ext/webgpu/compute_pass.rs
+++ b/ext/webgpu/compute_pass.rs
@@ -34,7 +34,7 @@ pub fn op_webgpu_compute_pass_set_pipeline(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  wgpu_core::command::compute_ffi::wgpu_compute_pass_set_pipeline(
+  wgpu_core::command::compute_commands::wgpu_compute_pass_set_pipeline(
     &mut compute_pass_resource.0.borrow_mut(),
     compute_pipeline_resource.1,
   );
@@ -55,7 +55,7 @@ pub fn op_webgpu_compute_pass_dispatch_workgroups(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_workgroups(
+  wgpu_core::command::compute_commands::wgpu_compute_pass_dispatch_workgroups(
     &mut compute_pass_resource.0.borrow_mut(),
     x,
     y,
@@ -80,7 +80,7 @@ pub fn op_webgpu_compute_pass_dispatch_workgroups_indirect(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_workgroups_indirect(
+  wgpu_core::command::compute_commands::wgpu_compute_pass_dispatch_workgroups_indirect(
         &mut compute_pass_resource.0.borrow_mut(),
         buffer_resource.1,
         indirect_offset,
@@ -142,17 +142,12 @@ pub fn op_webgpu_compute_pass_set_bind_group(
 
   let dynamic_offsets_data: &[u32] = &dynamic_offsets_data[start..start + len];
 
-  // SAFETY: the raw pointer and length are of the same slice, and that slice
-  // lives longer than the below function invocation.
-  unsafe {
-    wgpu_core::command::compute_ffi::wgpu_compute_pass_set_bind_group(
-      &mut compute_pass_resource.0.borrow_mut(),
-      index,
-      bind_group_resource.1,
-      dynamic_offsets_data.as_ptr(),
-      dynamic_offsets_data.len(),
-    );
-  }
+  wgpu_core::command::compute_commands::wgpu_compute_pass_set_bind_group(
+    &mut compute_pass_resource.0.borrow_mut(),
+    index,
+    bind_group_resource.1,
+    dynamic_offsets_data,
+  );
 
   Ok(WebGpuResult::empty())
 }
@@ -168,16 +163,11 @@ pub fn op_webgpu_compute_pass_push_debug_group(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  let label = std::ffi::CString::new(group_label).unwrap();
-  // SAFETY: the string the raw pointer points to lives longer than the below
-  // function invocation.
-  unsafe {
-    wgpu_core::command::compute_ffi::wgpu_compute_pass_push_debug_group(
-      &mut compute_pass_resource.0.borrow_mut(),
-      label.as_ptr(),
-      0, // wgpu#975
-    );
-  }
+  wgpu_core::command::compute_commands::wgpu_compute_pass_push_debug_group(
+    &mut compute_pass_resource.0.borrow_mut(),
+    group_label,
+    0, // wgpu#975
+  );
 
   Ok(WebGpuResult::empty())
 }
@@ -192,7 +182,7 @@ pub fn op_webgpu_compute_pass_pop_debug_group(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  wgpu_core::command::compute_ffi::wgpu_compute_pass_pop_debug_group(
+  wgpu_core::command::compute_commands::wgpu_compute_pass_pop_debug_group(
     &mut compute_pass_resource.0.borrow_mut(),
   );
 
@@ -210,16 +200,11 @@ pub fn op_webgpu_compute_pass_insert_debug_marker(
     .resource_table
     .get::<WebGpuComputePass>(compute_pass_rid)?;
 
-  let label = std::ffi::CString::new(marker_label).unwrap();
-  // SAFETY: the string the raw pointer points to lives longer than the below
-  // function invocation.
-  unsafe {
-    wgpu_core::command::compute_ffi::wgpu_compute_pass_insert_debug_marker(
-      &mut compute_pass_resource.0.borrow_mut(),
-      label.as_ptr(),
-      0, // wgpu#975
-    );
-  }
+  wgpu_core::command::compute_commands::wgpu_compute_pass_insert_debug_marker(
+    &mut compute_pass_resource.0.borrow_mut(),
+    marker_label,
+    0, // wgpu#975
+  );
 
   Ok(WebGpuResult::empty())
 }
-- 
cgit v1.2.3