summaryrefslogtreecommitdiff
path: root/ext/webgpu/src/compute_pass.rs
diff options
context:
space:
mode:
Diffstat (limited to 'ext/webgpu/src/compute_pass.rs')
-rw-r--r--ext/webgpu/src/compute_pass.rs196
1 files changed, 65 insertions, 131 deletions
diff --git a/ext/webgpu/src/compute_pass.rs b/ext/webgpu/src/compute_pass.rs
index 5e27583f4..c4ae1608b 100644
--- a/ext/webgpu/src/compute_pass.rs
+++ b/ext/webgpu/src/compute_pass.rs
@@ -2,10 +2,10 @@
use deno_core::error::AnyError;
use deno_core::op;
+use deno_core::OpState;
+use deno_core::Resource;
use deno_core::ResourceId;
use deno_core::ZeroCopyBuf;
-use deno_core::{OpState, Resource};
-use serde::Deserialize;
use std::borrow::Cow;
use std::cell::RefCell;
@@ -20,25 +20,19 @@ impl Resource for WebGpuComputePass {
}
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassSetPipelineArgs {
- compute_pass_rid: ResourceId,
- pipeline: ResourceId,
-}
-
#[op]
pub fn op_webgpu_compute_pass_set_pipeline(
state: &mut OpState,
- args: ComputePassSetPipelineArgs,
+ compute_pass_rid: ResourceId,
+ pipeline: ResourceId,
) -> Result<WebGpuResult, AnyError> {
let compute_pipeline_resource =
state
.resource_table
- .get::<super::pipeline::WebGpuComputePipeline>(args.pipeline)?;
+ .get::<super::pipeline::WebGpuComputePipeline>(pipeline)?;
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
wgpu_core::command::compute_ffi::wgpu_compute_pass_set_pipeline(
&mut compute_pass_resource.0.borrow_mut(),
@@ -48,106 +42,82 @@ pub fn op_webgpu_compute_pass_set_pipeline(
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassDispatchArgs {
+#[op]
+pub fn op_webgpu_compute_pass_dispatch_workgroups(
+ state: &mut OpState,
compute_pass_rid: ResourceId,
x: u32,
y: u32,
z: u32,
-}
-
-#[op]
-pub fn op_webgpu_compute_pass_dispatch(
- state: &mut OpState,
- args: ComputePassDispatchArgs,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
- wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch(
+ wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_workgroups(
&mut compute_pass_resource.0.borrow_mut(),
- args.x,
- args.y,
- args.z,
+ x,
+ y,
+ z,
);
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassDispatchIndirectArgs {
+#[op]
+pub fn op_webgpu_compute_pass_dispatch_workgroups_indirect(
+ state: &mut OpState,
compute_pass_rid: ResourceId,
indirect_buffer: ResourceId,
indirect_offset: u64,
-}
-
-#[op]
-pub fn op_webgpu_compute_pass_dispatch_indirect(
- state: &mut OpState,
- args: ComputePassDispatchIndirectArgs,
) -> Result<WebGpuResult, AnyError> {
let buffer_resource = state
.resource_table
- .get::<super::buffer::WebGpuBuffer>(args.indirect_buffer)?;
+ .get::<super::buffer::WebGpuBuffer>(indirect_buffer)?;
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
- wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_indirect(
- &mut compute_pass_resource.0.borrow_mut(),
- buffer_resource.0,
- args.indirect_offset,
- );
+ wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_workgroups_indirect(
+ &mut compute_pass_resource.0.borrow_mut(),
+ buffer_resource.0,
+ indirect_offset,
+ );
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassBeginPipelineStatisticsQueryArgs {
- compute_pass_rid: ResourceId,
- query_set: ResourceId,
- query_index: u32,
-}
-
#[op]
pub fn op_webgpu_compute_pass_begin_pipeline_statistics_query(
state: &mut OpState,
- args: ComputePassBeginPipelineStatisticsQueryArgs,
+ compute_pass_rid: ResourceId,
+ query_set: ResourceId,
+ query_index: u32,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
let query_set_resource = state
.resource_table
- .get::<super::WebGpuQuerySet>(args.query_set)?;
+ .get::<super::WebGpuQuerySet>(query_set)?;
wgpu_core::command::compute_ffi::wgpu_compute_pass_begin_pipeline_statistics_query(
&mut compute_pass_resource.0.borrow_mut(),
query_set_resource.0,
- args.query_index,
+ query_index,
);
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassEndPipelineStatisticsQueryArgs {
- compute_pass_rid: ResourceId,
-}
-
#[op]
pub fn op_webgpu_compute_pass_end_pipeline_statistics_query(
state: &mut OpState,
- args: ComputePassEndPipelineStatisticsQueryArgs,
+ compute_pass_rid: ResourceId,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
wgpu_core::command::compute_ffi::wgpu_compute_pass_end_pipeline_statistics_query(
&mut compute_pass_resource.0.borrow_mut(),
@@ -156,56 +126,44 @@ pub fn op_webgpu_compute_pass_end_pipeline_statistics_query(
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassWriteTimestampArgs {
- compute_pass_rid: ResourceId,
- query_set: ResourceId,
- query_index: u32,
-}
-
#[op]
pub fn op_webgpu_compute_pass_write_timestamp(
state: &mut OpState,
- args: ComputePassWriteTimestampArgs,
+ compute_pass_rid: ResourceId,
+ query_set: ResourceId,
+ query_index: u32,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
let query_set_resource = state
.resource_table
- .get::<super::WebGpuQuerySet>(args.query_set)?;
+ .get::<super::WebGpuQuerySet>(query_set)?;
wgpu_core::command::compute_ffi::wgpu_compute_pass_write_timestamp(
&mut compute_pass_resource.0.borrow_mut(),
query_set_resource.0,
- args.query_index,
+ query_index,
);
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassEndPassArgs {
- command_encoder_rid: ResourceId,
- compute_pass_rid: ResourceId,
-}
-
#[op]
-pub fn op_webgpu_compute_pass_end_pass(
+pub fn op_webgpu_compute_pass_end(
state: &mut OpState,
- args: ComputePassEndPassArgs,
+ command_encoder_rid: ResourceId,
+ compute_pass_rid: ResourceId,
) -> Result<WebGpuResult, AnyError> {
let command_encoder_resource = state
.resource_table
.get::<super::command_encoder::WebGpuCommandEncoder>(
- args.command_encoder_rid,
+ command_encoder_rid,
)?;
let command_encoder = command_encoder_resource.0;
let compute_pass_resource = state
.resource_table
- .take::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .take::<WebGpuComputePass>(compute_pass_rid)?;
let compute_pass = &compute_pass_resource.0.borrow();
let instance = state.borrow::<super::Instance>();
@@ -215,41 +173,35 @@ pub fn op_webgpu_compute_pass_end_pass(
))
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassSetBindGroupArgs {
+#[op]
+pub fn op_webgpu_compute_pass_set_bind_group(
+ state: &mut OpState,
compute_pass_rid: ResourceId,
index: u32,
bind_group: ResourceId,
dynamic_offsets_data: ZeroCopyBuf,
dynamic_offsets_data_start: usize,
dynamic_offsets_data_length: usize,
-}
-
-#[op]
-pub fn op_webgpu_compute_pass_set_bind_group(
- state: &mut OpState,
- args: ComputePassSetBindGroupArgs,
) -> Result<WebGpuResult, AnyError> {
let bind_group_resource =
state
.resource_table
- .get::<super::binding::WebGpuBindGroup>(args.bind_group)?;
+ .get::<super::binding::WebGpuBindGroup>(bind_group)?;
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
// Align the data
- assert!(args.dynamic_offsets_data_start % std::mem::size_of::<u32>() == 0);
+ assert!(dynamic_offsets_data_start % std::mem::size_of::<u32>() == 0);
let (prefix, dynamic_offsets_data, suffix) =
- // SAFETY: A u8 to u32 cast is safe because we asserted that the length is a
- // multiple of 4.
- unsafe { args.dynamic_offsets_data.align_to::<u32>() };
+ // SAFETY: A u8 to u32 cast is safe because we asserted that the length is a
+ // multiple of 4.
+ unsafe { dynamic_offsets_data.align_to::<u32>() };
assert!(prefix.is_empty());
assert!(suffix.is_empty());
- let start = args.dynamic_offsets_data_start;
- let len = args.dynamic_offsets_data_length;
+ let start = dynamic_offsets_data_start;
+ let len = dynamic_offsets_data_length;
// Assert that length and start are both in bounds
assert!(start <= dynamic_offsets_data.len());
@@ -262,7 +214,7 @@ pub fn op_webgpu_compute_pass_set_bind_group(
unsafe {
wgpu_core::command::compute_ffi::wgpu_compute_pass_set_bind_group(
&mut compute_pass_resource.0.borrow_mut(),
- args.index,
+ index,
bind_group_resource.0,
dynamic_offsets_data.as_ptr(),
dynamic_offsets_data.len(),
@@ -272,23 +224,17 @@ pub fn op_webgpu_compute_pass_set_bind_group(
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassPushDebugGroupArgs {
- compute_pass_rid: ResourceId,
- group_label: String,
-}
-
#[op]
pub fn op_webgpu_compute_pass_push_debug_group(
state: &mut OpState,
- args: ComputePassPushDebugGroupArgs,
+ compute_pass_rid: ResourceId,
+ group_label: String,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
- let label = std::ffi::CString::new(args.group_label).unwrap();
+ 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 {
@@ -302,20 +248,14 @@ pub fn op_webgpu_compute_pass_push_debug_group(
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassPopDebugGroupArgs {
- compute_pass_rid: ResourceId,
-}
-
#[op]
pub fn op_webgpu_compute_pass_pop_debug_group(
state: &mut OpState,
- args: ComputePassPopDebugGroupArgs,
+ compute_pass_rid: ResourceId,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
wgpu_core::command::compute_ffi::wgpu_compute_pass_pop_debug_group(
&mut compute_pass_resource.0.borrow_mut(),
@@ -324,23 +264,17 @@ pub fn op_webgpu_compute_pass_pop_debug_group(
Ok(WebGpuResult::empty())
}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ComputePassInsertDebugMarkerArgs {
- compute_pass_rid: ResourceId,
- marker_label: String,
-}
-
#[op]
pub fn op_webgpu_compute_pass_insert_debug_marker(
state: &mut OpState,
- args: ComputePassInsertDebugMarkerArgs,
+ compute_pass_rid: ResourceId,
+ marker_label: String,
) -> Result<WebGpuResult, AnyError> {
let compute_pass_resource = state
.resource_table
- .get::<WebGpuComputePass>(args.compute_pass_rid)?;
+ .get::<WebGpuComputePass>(compute_pass_rid)?;
- let label = std::ffi::CString::new(args.marker_label).unwrap();
+ 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 {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 08:03:53 +0000