From e7954413e16d5814db5da6389f8d6e0c328812aa Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Fri, 26 Mar 2021 03:17:37 +0900 Subject: upgrade: Rust 1.51.0 (#9895) --- op_crates/webgpu/compute_pass.rs | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'op_crates/webgpu/compute_pass.rs') diff --git a/op_crates/webgpu/compute_pass.rs b/op_crates/webgpu/compute_pass.rs index 9e1285dcb..b9d5b12d3 100644 --- a/op_crates/webgpu/compute_pass.rs +++ b/op_crates/webgpu/compute_pass.rs @@ -11,12 +11,12 @@ use serde::Deserialize; use std::borrow::Cow; use std::cell::RefCell; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUComputePass( +pub(crate) struct WebGpuComputePass( pub(crate) RefCell, ); -impl Resource for WebGPUComputePass { +impl Resource for WebGpuComputePass { fn name(&self) -> Cow { "webGPUComputePass".into() } @@ -36,11 +36,11 @@ pub fn op_webgpu_compute_pass_set_pipeline( ) -> Result { let compute_pipeline_resource = state .resource_table - .get::(args.pipeline) + .get::(args.pipeline) .ok_or_else(bad_resource_id)?; let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::compute_ffi::wgpu_compute_pass_set_pipeline( @@ -67,7 +67,7 @@ pub fn op_webgpu_compute_pass_dispatch( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch( @@ -95,11 +95,11 @@ pub fn op_webgpu_compute_pass_dispatch_indirect( ) -> Result { let buffer_resource = state .resource_table - .get::(args.indirect_buffer) + .get::(args.indirect_buffer) .ok_or_else(bad_resource_id)?; let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::compute_ffi::wgpu_compute_pass_dispatch_indirect( @@ -126,11 +126,11 @@ pub fn op_webgpu_compute_pass_begin_pipeline_statistics_query( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::(args.query_set) + .get::(args.query_set) .ok_or_else(bad_resource_id)?; unsafe { @@ -157,7 +157,7 @@ pub fn op_webgpu_compute_pass_end_pipeline_statistics_query( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -184,11 +184,11 @@ pub fn op_webgpu_compute_pass_write_timestamp( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::(args.query_set) + .get::(args.query_set) .ok_or_else(bad_resource_id)?; unsafe { @@ -216,14 +216,14 @@ pub fn op_webgpu_compute_pass_end_pass( ) -> Result { let command_encoder_resource = state .resource_table - .get::( + .get::( args.command_encoder_rid, ) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let compute_pass_resource = state .resource_table - .take::(args.compute_pass_rid) + .take::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let compute_pass = &compute_pass_resource.0.borrow(); let instance = state.borrow::(); @@ -235,7 +235,7 @@ pub fn op_webgpu_compute_pass_end_pass( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -256,11 +256,11 @@ pub fn op_webgpu_compute_pass_set_bind_group( ) -> Result { let bind_group_resource = state .resource_table - .get::(args.bind_group) + .get::(args.bind_group) .ok_or_else(bad_resource_id)?; let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -298,7 +298,7 @@ pub fn op_webgpu_compute_pass_push_debug_group( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -326,7 +326,7 @@ pub fn op_webgpu_compute_pass_pop_debug_group( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::compute_ffi::wgpu_compute_pass_pop_debug_group( @@ -350,7 +350,7 @@ pub fn op_webgpu_compute_pass_insert_debug_marker( ) -> Result { let compute_pass_resource = state .resource_table - .get::(args.compute_pass_rid) + .get::(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { -- cgit v1.2.3