diff options
author | Yusuke Tanaka <yusuktan@maguro.dev> | 2021-03-26 03:17:37 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 19:17:37 +0100 |
commit | e7954413e16d5814db5da6389f8d6e0c328812aa (patch) | |
tree | 2840a275019df3e193c7c2f84442740ce7b7e48e /op_crates/webgpu/bundle.rs | |
parent | 881e1e8164f1661158bac24f7ec03b969a0a8a02 (diff) |
upgrade: Rust 1.51.0 (#9895)
Diffstat (limited to 'op_crates/webgpu/bundle.rs')
-rw-r--r-- | op_crates/webgpu/bundle.rs | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/op_crates/webgpu/bundle.rs b/op_crates/webgpu/bundle.rs index 4ef64d883..406b886cc 100644 --- a/op_crates/webgpu/bundle.rs +++ b/op_crates/webgpu/bundle.rs @@ -12,20 +12,20 @@ use std::borrow::Cow; use std::cell::RefCell; use std::rc::Rc; -use super::error::WebGPUError; +use super::error::WebGpuError; use super::texture::serialize_texture_format; -struct WebGPURenderBundleEncoder( +struct WebGpuRenderBundleEncoder( RefCell<wgpu_core::command::RenderBundleEncoder>, ); -impl Resource for WebGPURenderBundleEncoder { +impl Resource for WebGpuRenderBundleEncoder { fn name(&self) -> Cow<str> { "webGPURenderBundleEncoder".into() } } -pub(crate) struct WebGPURenderBundle(pub(crate) wgpu_core::id::RenderBundleId); -impl Resource for WebGPURenderBundle { +pub(crate) struct WebGpuRenderBundle(pub(crate) wgpu_core::id::RenderBundleId); +impl Resource for WebGpuRenderBundle { fn name(&self) -> Cow<str> { "webGPURenderBundle".into() } @@ -48,7 +48,7 @@ pub fn op_webgpu_create_render_bundle_encoder( ) -> Result<Value, AnyError> { let device_resource = state .resource_table - .get::<super::WebGPUDevice>(args.device_rid) + .get::<super::WebGpuDevice>(args.device_rid) .ok_or_else(bad_resource_id)?; let device = device_resource.0; @@ -80,13 +80,13 @@ pub fn op_webgpu_create_render_bundle_encoder( let rid = state .resource_table - .add(WebGPURenderBundleEncoder(RefCell::new( + .add(WebGpuRenderBundleEncoder(RefCell::new( render_bundle_encoder, ))); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from), + "err": maybe_err.map(WebGpuError::from), })) } @@ -104,7 +104,7 @@ pub fn op_webgpu_render_bundle_encoder_finish( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .take::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .take::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; let render_bundle_encoder = Rc::try_unwrap(render_bundle_encoder_resource) .ok() @@ -121,11 +121,11 @@ pub fn op_webgpu_render_bundle_encoder_finish( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPURenderBundle(render_bundle)); + let rid = state.resource_table.add(WebGpuRenderBundle(render_bundle)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -147,11 +147,11 @@ pub fn op_webgpu_render_bundle_encoder_set_bind_group( ) -> Result<Value, AnyError> { let bind_group_resource = state .resource_table - .get::<super::binding::WebGPUBindGroup>(args.bind_group) + .get::<super::binding::WebGpuBindGroup>(args.bind_group) .ok_or_else(bad_resource_id)?; let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; // I know this might look like it can be easily deduplicated, but it can not @@ -202,7 +202,7 @@ pub fn op_webgpu_render_bundle_encoder_push_debug_group( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -229,7 +229,7 @@ pub fn op_webgpu_render_bundle_encoder_pop_debug_group( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -255,7 +255,7 @@ pub fn op_webgpu_render_bundle_encoder_insert_debug_marker( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -283,11 +283,11 @@ pub fn op_webgpu_render_bundle_encoder_set_pipeline( ) -> Result<Value, AnyError> { let render_pipeline_resource = state .resource_table - .get::<super::pipeline::WebGPURenderPipeline>(args.pipeline) + .get::<super::pipeline::WebGpuRenderPipeline>(args.pipeline) .ok_or_else(bad_resource_id)?; let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::bundle_ffi::wgpu_render_bundle_set_pipeline( @@ -315,11 +315,11 @@ pub fn op_webgpu_render_bundle_encoder_set_index_buffer( ) -> Result<Value, AnyError> { let buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.buffer) + .get::<super::buffer::WebGpuBuffer>(args.buffer) .ok_or_else(bad_resource_id)?; let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; render_bundle_encoder_resource @@ -352,11 +352,11 @@ pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer( ) -> Result<Value, AnyError> { let buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.buffer) + .get::<super::buffer::WebGpuBuffer>(args.buffer) .ok_or_else(bad_resource_id)?; let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::bundle_ffi::wgpu_render_bundle_set_vertex_buffer( @@ -387,7 +387,7 @@ pub fn op_webgpu_render_bundle_encoder_draw( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::bundle_ffi::wgpu_render_bundle_draw( @@ -419,7 +419,7 @@ pub fn op_webgpu_render_bundle_encoder_draw_indexed( ) -> Result<Value, AnyError> { let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::bundle_ffi::wgpu_render_bundle_draw_indexed( @@ -449,11 +449,11 @@ pub fn op_webgpu_render_bundle_encoder_draw_indirect( ) -> Result<Value, AnyError> { let buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.indirect_buffer) + .get::<super::buffer::WebGpuBuffer>(args.indirect_buffer) .ok_or_else(bad_resource_id)?; let render_bundle_encoder_resource = state .resource_table - .get::<WebGPURenderBundleEncoder>(args.render_bundle_encoder_rid) + .get::<WebGpuRenderBundleEncoder>(args.render_bundle_encoder_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::bundle_ffi::wgpu_render_bundle_draw_indirect( |