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/render_pass.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/render_pass.rs')
-rw-r--r-- | op_crates/webgpu/render_pass.rs | 84 |
1 files changed, 41 insertions, 43 deletions
diff --git a/op_crates/webgpu/render_pass.rs b/op_crates/webgpu/render_pass.rs index bf3bd092d..38ebd6db8 100644 --- a/op_crates/webgpu/render_pass.rs +++ b/op_crates/webgpu/render_pass.rs @@ -3,8 +3,6 @@ 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::ResourceId; use deno_core::ZeroCopyBuf; use deno_core::{OpState, Resource}; @@ -12,7 +10,7 @@ use serde::Deserialize; use std::borrow::Cow; use std::cell::RefCell; -use super::error::WebGpuError; +use super::error::WebGpuResult; pub(crate) struct WebGpuRenderPass( pub(crate) RefCell<wgpu_core::command::RenderPass>, @@ -39,7 +37,7 @@ pub fn op_webgpu_render_pass_set_viewport( state: &mut OpState, args: RenderPassSetViewportArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -55,7 +53,7 @@ pub fn op_webgpu_render_pass_set_viewport( args.max_depth, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -72,7 +70,7 @@ pub fn op_webgpu_render_pass_set_scissor_rect( state: &mut OpState, args: RenderPassSetScissorRectArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -86,7 +84,7 @@ pub fn op_webgpu_render_pass_set_scissor_rect( args.height, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -109,7 +107,7 @@ pub fn op_webgpu_render_pass_set_blend_color( state: &mut OpState, args: RenderPassSetBlendColorArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -125,7 +123,7 @@ pub fn op_webgpu_render_pass_set_blend_color( }, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -139,7 +137,7 @@ pub fn op_webgpu_render_pass_set_stencil_reference( state: &mut OpState, args: RenderPassSetStencilReferenceArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -150,7 +148,7 @@ pub fn op_webgpu_render_pass_set_stencil_reference( args.reference, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -165,7 +163,7 @@ pub fn op_webgpu_render_pass_begin_pipeline_statistics_query( state: &mut OpState, args: RenderPassBeginPipelineStatisticsQueryArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -183,7 +181,7 @@ pub fn op_webgpu_render_pass_begin_pipeline_statistics_query( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -196,7 +194,7 @@ pub fn op_webgpu_render_pass_end_pipeline_statistics_query( state: &mut OpState, args: RenderPassEndPipelineStatisticsQueryArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -208,7 +206,7 @@ pub fn op_webgpu_render_pass_end_pipeline_statistics_query( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -223,7 +221,7 @@ pub fn op_webgpu_render_pass_write_timestamp( state: &mut OpState, args: RenderPassWriteTimestampArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -241,7 +239,7 @@ pub fn op_webgpu_render_pass_write_timestamp( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -255,7 +253,7 @@ pub fn op_webgpu_render_pass_execute_bundles( state: &mut OpState, args: RenderPassExecuteBundlesArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let mut render_bundle_ids = vec![]; for rid in &args.bundles { @@ -279,7 +277,7 @@ pub fn op_webgpu_render_pass_execute_bundles( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -293,7 +291,7 @@ pub fn op_webgpu_render_pass_end_pass( state: &mut OpState, args: RenderPassEndPassArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let command_encoder_resource = state .resource_table .get::<super::command_encoder::WebGpuCommandEncoder>( @@ -310,7 +308,7 @@ pub fn op_webgpu_render_pass_end_pass( let maybe_err = gfx_select!(command_encoder => instance.command_encoder_run_render_pass(command_encoder, render_pass)).err(); - Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) + Ok(WebGpuResult::maybe_err(maybe_err)) } #[derive(Deserialize)] @@ -328,7 +326,7 @@ pub fn op_webgpu_render_pass_set_bind_group( state: &mut OpState, args: RenderPassSetBindGroupArgs, zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let zero_copy = zero_copy.ok_or_else(null_opbuf)?; let bind_group_resource = state .resource_table @@ -370,7 +368,7 @@ pub fn op_webgpu_render_pass_set_bind_group( } }; - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -384,7 +382,7 @@ pub fn op_webgpu_render_pass_push_debug_group( state: &mut OpState, args: RenderPassPushDebugGroupArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -399,7 +397,7 @@ pub fn op_webgpu_render_pass_push_debug_group( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -412,7 +410,7 @@ pub fn op_webgpu_render_pass_pop_debug_group( state: &mut OpState, args: RenderPassPopDebugGroupArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -422,7 +420,7 @@ pub fn op_webgpu_render_pass_pop_debug_group( &mut render_pass_resource.0.borrow_mut(), ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -436,7 +434,7 @@ pub fn op_webgpu_render_pass_insert_debug_marker( state: &mut OpState, args: RenderPassInsertDebugMarkerArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -451,7 +449,7 @@ pub fn op_webgpu_render_pass_insert_debug_marker( ); } - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -465,7 +463,7 @@ pub fn op_webgpu_render_pass_set_pipeline( state: &mut OpState, args: RenderPassSetPipelineArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pipeline_resource = state .resource_table .get::<super::pipeline::WebGpuRenderPipeline>(args.pipeline) @@ -480,7 +478,7 @@ pub fn op_webgpu_render_pass_set_pipeline( render_pipeline_resource.0, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -497,7 +495,7 @@ pub fn op_webgpu_render_pass_set_index_buffer( state: &mut OpState, args: RenderPassSetIndexBufferArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let buffer_resource = state .resource_table .get::<super::buffer::WebGpuBuffer>(args.buffer) @@ -514,7 +512,7 @@ pub fn op_webgpu_render_pass_set_index_buffer( std::num::NonZeroU64::new(args.size), ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -531,7 +529,7 @@ pub fn op_webgpu_render_pass_set_vertex_buffer( state: &mut OpState, args: RenderPassSetVertexBufferArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let buffer_resource = state .resource_table .get::<super::buffer::WebGpuBuffer>(args.buffer) @@ -549,7 +547,7 @@ pub fn op_webgpu_render_pass_set_vertex_buffer( std::num::NonZeroU64::new(args.size), ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -566,7 +564,7 @@ pub fn op_webgpu_render_pass_draw( state: &mut OpState, args: RenderPassDrawArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -580,7 +578,7 @@ pub fn op_webgpu_render_pass_draw( args.first_instance, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -598,7 +596,7 @@ pub fn op_webgpu_render_pass_draw_indexed( state: &mut OpState, args: RenderPassDrawIndexedArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let render_pass_resource = state .resource_table .get::<WebGpuRenderPass>(args.render_pass_rid) @@ -613,7 +611,7 @@ pub fn op_webgpu_render_pass_draw_indexed( args.first_instance, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -628,7 +626,7 @@ pub fn op_webgpu_render_pass_draw_indirect( state: &mut OpState, args: RenderPassDrawIndirectArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let buffer_resource = state .resource_table .get::<super::buffer::WebGpuBuffer>(args.indirect_buffer) @@ -644,7 +642,7 @@ pub fn op_webgpu_render_pass_draw_indirect( args.indirect_offset, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } #[derive(Deserialize)] @@ -659,7 +657,7 @@ pub fn op_webgpu_render_pass_draw_indexed_indirect( state: &mut OpState, args: RenderPassDrawIndexedIndirectArgs, _zero_copy: Option<ZeroCopyBuf>, -) -> Result<Value, AnyError> { +) -> Result<WebGpuResult, AnyError> { let buffer_resource = state .resource_table .get::<super::buffer::WebGpuBuffer>(args.indirect_buffer) @@ -675,5 +673,5 @@ pub fn op_webgpu_render_pass_draw_indexed_indirect( args.indirect_offset, ); - Ok(json!({})) + Ok(WebGpuResult::empty()) } |