diff options
author | Aaron O'Mullan <aaron.omullan@gmail.com> | 2021-04-05 18:40:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-05 18:40:24 +0200 |
commit | 2aed322dd507a8568b6ee6f4897e9a8e3220f763 (patch) | |
tree | e9a45c0b7688a9881ea9ce132b92554ef2955ad6 /op_crates/webgpu/queue.rs | |
parent | 284e6c303956e8ca20af63b4ecc045438a260fe6 (diff) |
refactor: convert ops to use serde_v8 (#10009)
This commit rewrites most of the ops to use "serde_v8" instead
of "json" serialization.
Diffstat (limited to 'op_crates/webgpu/queue.rs')
-rw-r--r-- | op_crates/webgpu/queue.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/op_crates/webgpu/queue.rs b/op_crates/webgpu/queue.rs index c96e2a158..93fd95502 100644 --- a/op_crates/webgpu/queue.rs +++ b/op_crates/webgpu/queue.rs @@ -3,14 +3,12 @@ use deno_core::error::bad_resource_id; use deno_core::error::null_opbuf; use deno_core::error::AnyError; -use deno_core::serde_json::json; -use deno_core::serde_json::Value; use deno_core::OpState; use deno_core::ResourceId; use deno_core::ZeroCopyBuf; use serde::Deserialize; -use super::error::WebGpuError; +use super::error::WebGpuResult; type WebGpuQueue = super::WebGpuDevice; @@ -25,7 +23,7 @@ pub fn op_webgpu_queue_submit( state: &mut OpState, args: QueueSubmitArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let instance = state.borrow::<super::Instance>(); let queue_resource = state .resource_table @@ -46,7 +44,7 @@ pub fn op_webgpu_queue_submit( let maybe_err = gfx_select!(queue => instance.queue_submit(queue, &ids)).err(); - Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) + Ok(WebGpuResult::maybe_err(maybe_err)) } #[derive(Deserialize)] @@ -71,7 +69,7 @@ pub fn op_webgpu_write_buffer( state: &mut OpState, args: QueueWriteBufferArgs, zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let zero_copy = zero_copy.ok_or_else(null_opbuf)?; let instance = state.borrow::<super::Instance>(); let buffer_resource = state @@ -97,7 +95,7 @@ pub fn op_webgpu_write_buffer( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) + Ok(WebGpuResult::maybe_err(maybe_err)) } #[derive(Deserialize)] @@ -113,7 +111,7 @@ pub fn op_webgpu_write_texture( state: &mut OpState, args: QueueWriteTextureArgs, zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let zero_copy = zero_copy.ok_or_else(null_opbuf)?; let instance = state.borrow::<super::Instance>(); let texture_resource = state @@ -157,5 +155,5 @@ pub fn op_webgpu_write_texture( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) + Ok(WebGpuResult::maybe_err(maybe_err)) } |