Remove exposed C symbols from renderpass/computepass recording (#5409)

Co-authored-by: Connor Fitzgerald <[email protected]>
gfx-rs · Apr 17, 2024 · ad6774f · ad6774f
1 parent c1291bd
commit ad6774f
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 343 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -154,6 +154,7 @@ Bottom level categories:
 - Failing to set the device lost closure will call the closure before returning. By @bradwerth in [#5358](https://github.com/gfx-rs/wgpu/pull/5358).
 - Use memory pooling for UsageScopes to avoid frequent large allocations. by @robtfm in [#5414](https://github.com/gfx-rs/wgpu/pull/5414)
 - Fix deadlocks caused by recursive read-write lock acquisitions [#5426](https://github.com/gfx-rs/wgpu/pull/5426).
+- Remove exposed C symbols (`extern "C"` + [no_mangle]) from RenderPass & ComputePass recording. By @wumpf in [#5409](https://github.com/gfx-rs/wgpu/pull/5409).
 - Fix surfaces being only compatible with first backend enabled on an instance, causing failures when manually specifying an adapter. By @Wumpf in [#5535](https://github.com/gfx-rs/wgpu/pull/5535).
 
 #### Naga

diff --git a/deno_webgpu/compute_pass.rs b/deno_webgpu/compute_pass.rs
@@ -31,7 +31,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,
  );
@@ -52,7 +52,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,
@@ -77,7 +77,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,
@@ -137,17 +137,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())
 }
@@ -163,16 +158,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())
 }
@@ -187,7 +177,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(),
  );
 
@@ -205,16 +195,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())
 }
diff --git a/deno_webgpu/render_pass.rs b/deno_webgpu/render_pass.rs
@@ -41,7 +41,7 @@ pub fn op_webgpu_render_pass_set_viewport(
  .resource_table
  .get::<WebGpuRenderPass>(args.render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_viewport(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_viewport(
  &mut render_pass_resource.0.borrow_mut(),
  args.x,
  args.y,
@@ -68,7 +68,7 @@ pub fn op_webgpu_render_pass_set_scissor_rect(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_scissor_rect(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_scissor_rect(
  &mut render_pass_resource.0.borrow_mut(),
  x,
  y,
@@ -90,7 +90,7 @@ pub fn op_webgpu_render_pass_set_blend_constant(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_blend_constant(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_blend_constant(
  &mut render_pass_resource.0.borrow_mut(),
  &color,
  );
@@ -109,7 +109,7 @@ pub fn op_webgpu_render_pass_set_stencil_reference(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_stencil_reference(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_stencil_reference(
  &mut render_pass_resource.0.borrow_mut(),
  reference,
  );
@@ -128,7 +128,7 @@ pub fn op_webgpu_render_pass_begin_occlusion_query(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_begin_occlusion_query(
+ wgpu_core::command::render_commands::wgpu_render_pass_begin_occlusion_query(
  &mut render_pass_resource.0.borrow_mut(),
  query_index,
  );
@@ -146,7 +146,7 @@ pub fn op_webgpu_render_pass_end_occlusion_query(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_end_occlusion_query(
+ wgpu_core::command::render_commands::wgpu_render_pass_end_occlusion_query(
  &mut render_pass_resource.0.borrow_mut(),
  );
 
@@ -174,15 +174,10 @@ pub fn op_webgpu_render_pass_execute_bundles(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- // 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::render_ffi::wgpu_render_pass_execute_bundles(
- &mut render_pass_resource.0.borrow_mut(),
- bundles.as_ptr(),
- bundles.len(),
- );
- }
+ wgpu_core::command::render_commands::wgpu_render_pass_execute_bundles(
+ &mut render_pass_resource.0.borrow_mut(),
+ &bundles,
+ );
 
  Ok(WebGpuResult::empty())
 }
@@ -235,17 +230,12 @@ pub fn op_webgpu_render_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::render_ffi::wgpu_render_pass_set_bind_group(
- &mut render_pass_resource.0.borrow_mut(),
- index,
- bind_group_resource.1,
- dynamic_offsets_data.as_ptr(),
- dynamic_offsets_data.len(),
- );
- }
+ wgpu_core::command::render_commands::wgpu_render_pass_set_bind_group(
+ &mut render_pass_resource.0.borrow_mut(),
+ index,
+ bind_group_resource.1,
+ dynamic_offsets_data,
+ );
 
  Ok(WebGpuResult::empty())
 }
@@ -261,16 +251,11 @@ pub fn op_webgpu_render_pass_push_debug_group(
  .resource_table
  .get::<WebGpuRenderPass>(render_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::render_ffi::wgpu_render_pass_push_debug_group(
- &mut render_pass_resource.0.borrow_mut(),
- label.as_ptr(),
- 0, // wgpu#975
- );
- }
+ wgpu_core::command::render_commands::wgpu_render_pass_push_debug_group(
+ &mut render_pass_resource.0.borrow_mut(),
+ group_label,
+ 0, // wgpu#975
+ );
 
  Ok(WebGpuResult::empty())
 }
@@ -285,7 +270,7 @@ pub fn op_webgpu_render_pass_pop_debug_group(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_pop_debug_group(
+ wgpu_core::command::render_commands::wgpu_render_pass_pop_debug_group(
  &mut render_pass_resource.0.borrow_mut(),
  );
 
@@ -303,16 +288,11 @@ pub fn op_webgpu_render_pass_insert_debug_marker(
  .resource_table
  .get::<WebGpuRenderPass>(render_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::render_ffi::wgpu_render_pass_insert_debug_marker(
- &mut render_pass_resource.0.borrow_mut(),
- label.as_ptr(),
- 0, // wgpu#975
- );
- }
+ wgpu_core::command::render_commands::wgpu_render_pass_insert_debug_marker(
+ &mut render_pass_resource.0.borrow_mut(),
+ marker_label,
+ 0, // wgpu#975
+ );
 
  Ok(WebGpuResult::empty())
 }
@@ -331,7 +311,7 @@ pub fn op_webgpu_render_pass_set_pipeline(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_pipeline(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_pipeline(
  &mut render_pass_resource.0.borrow_mut(),
  render_pipeline_resource.1,
  );
@@ -401,7 +381,7 @@ pub fn op_webgpu_render_pass_set_vertex_buffer(
  None
  };
 
- wgpu_core::command::render_ffi::wgpu_render_pass_set_vertex_buffer(
+ wgpu_core::command::render_commands::wgpu_render_pass_set_vertex_buffer(
  &mut render_pass_resource.0.borrow_mut(),
  slot,
  buffer_resource.1,
@@ -426,7 +406,7 @@ pub fn op_webgpu_render_pass_draw(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_draw(
+ wgpu_core::command::render_commands::wgpu_render_pass_draw(
  &mut render_pass_resource.0.borrow_mut(),
  vertex_count,
  instance_count,
@@ -452,7 +432,7 @@ pub fn op_webgpu_render_pass_draw_indexed(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_draw_indexed(
+ wgpu_core::command::render_commands::wgpu_render_pass_draw_indexed(
  &mut render_pass_resource.0.borrow_mut(),
  index_count,
  instance_count,
@@ -479,7 +459,7 @@ pub fn op_webgpu_render_pass_draw_indirect(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_draw_indirect(
+ wgpu_core::command::render_commands::wgpu_render_pass_draw_indirect(
  &mut render_pass_resource.0.borrow_mut(),
  buffer_resource.1,
  indirect_offset,
@@ -503,7 +483,7 @@ pub fn op_webgpu_render_pass_draw_indexed_indirect(
  .resource_table
  .get::<WebGpuRenderPass>(render_pass_rid)?;
 
- wgpu_core::command::render_ffi::wgpu_render_pass_draw_indexed_indirect(
+ wgpu_core::command::render_commands::wgpu_render_pass_draw_indexed_indirect(
  &mut render_pass_resource.0.borrow_mut(),
  buffer_resource.1,
  indirect_offset,

diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs
@@ -1548,15 +1548,14 @@ pub mod bundle_ffi {
  offsets: *const DynamicOffset,
  offset_length: usize,
  ) {
- let redundant = unsafe {
- bundle.current_bind_groups.set_and_check_redundant(
- bind_group_id,
- index,
- &mut bundle.base.dynamic_offsets,
- offsets,
- offset_length,
- )
- };
+ let offsets = unsafe { slice::from_raw_parts(offsets, offset_length) };
+
+ let redundant = bundle.current_bind_groups.set_and_check_redundant(
+ bind_group_id,
+ index,
+ &mut bundle.base.dynamic_offsets,
+ offsets,
+ );
 
  if redundant {
  return;