diff options
Diffstat (limited to 'op_crates/webgpu')
| -rw-r--r-- | op_crates/webgpu/binding.rs | 62 | ||||
| -rw-r--r-- | op_crates/webgpu/buffer.rs | 34 | ||||
| -rw-r--r-- | op_crates/webgpu/bundle.rs | 52 | ||||
| -rw-r--r-- | op_crates/webgpu/command_encoder.rs | 130 | ||||
| -rw-r--r-- | op_crates/webgpu/compute_pass.rs | 42 | ||||
| -rw-r--r-- | op_crates/webgpu/error.rs | 112 | ||||
| -rw-r--r-- | op_crates/webgpu/lib.rs | 34 | ||||
| -rw-r--r-- | op_crates/webgpu/pipeline.rs | 214 | ||||
| -rw-r--r-- | op_crates/webgpu/queue.rs | 30 | ||||
| -rw-r--r-- | op_crates/webgpu/render_pass.rs | 72 | ||||
| -rw-r--r-- | op_crates/webgpu/sampler.rs | 12 | ||||
| -rw-r--r-- | op_crates/webgpu/shader.rs | 12 | ||||
| -rw-r--r-- | op_crates/webgpu/texture.rs | 26 |
13 files changed, 415 insertions, 417 deletions
diff --git a/op_crates/webgpu/binding.rs b/op_crates/webgpu/binding.rs index a004d1f45..512ba1608 100644 --- a/op_crates/webgpu/binding.rs +++ b/op_crates/webgpu/binding.rs @@ -10,19 +10,19 @@ use deno_core::{OpState, Resource}; use serde::Deserialize; use std::borrow::Cow; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUBindGroupLayout( +pub(crate) struct WebGpuBindGroupLayout( pub(crate) wgpu_core::id::BindGroupLayoutId, ); -impl Resource for WebGPUBindGroupLayout { +impl Resource for WebGpuBindGroupLayout { fn name(&self) -> Cow<str> { "webGPUBindGroupLayout".into() } } -pub(crate) struct WebGPUBindGroup(pub(crate) wgpu_core::id::BindGroupId); -impl Resource for WebGPUBindGroup { +pub(crate) struct WebGpuBindGroup(pub(crate) wgpu_core::id::BindGroupId); +impl Resource for WebGpuBindGroup { fn name(&self) -> Cow<str> { "webGPUBindGroup".into() } @@ -30,7 +30,7 @@ impl Resource for WebGPUBindGroup { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUBufferBindingLayout { +struct GpuBufferBindingLayout { #[serde(rename = "type")] kind: Option<String>, has_dynamic_offset: Option<bool>, @@ -39,14 +39,14 @@ struct GPUBufferBindingLayout { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUSamplerBindingLayout { +struct GpuSamplerBindingLayout { #[serde(rename = "type")] kind: Option<String>, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUTextureBindingLayout { +struct GpuTextureBindingLayout { sample_type: Option<String>, view_dimension: Option<String>, multisampled: Option<bool>, @@ -54,7 +54,7 @@ struct GPUTextureBindingLayout { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUStorageTextureBindingLayout { +struct GpuStorageTextureBindingLayout { access: String, format: String, view_dimension: Option<String>, @@ -62,13 +62,13 @@ struct GPUStorageTextureBindingLayout { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUBindGroupLayoutEntry { +struct GpuBindGroupLayoutEntry { binding: u32, visibility: u32, - buffer: Option<GPUBufferBindingLayout>, - sampler: Option<GPUSamplerBindingLayout>, - texture: Option<GPUTextureBindingLayout>, - storage_texture: Option<GPUStorageTextureBindingLayout>, + buffer: Option<GpuBufferBindingLayout>, + sampler: Option<GpuSamplerBindingLayout>, + texture: Option<GpuTextureBindingLayout>, + storage_texture: Option<GpuStorageTextureBindingLayout>, } #[derive(Deserialize)] @@ -76,7 +76,7 @@ struct GPUBindGroupLayoutEntry { pub struct CreateBindGroupLayoutArgs { device_rid: ResourceId, label: Option<String>, - entries: Vec<GPUBindGroupLayoutEntry>, + entries: Vec<GpuBindGroupLayoutEntry>, } pub fn op_webgpu_create_bind_group_layout( @@ -87,7 +87,7 @@ pub fn op_webgpu_create_bind_group_layout( let instance = state.borrow::<super::Instance>(); 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; @@ -205,11 +205,11 @@ pub fn op_webgpu_create_bind_group_layout( let rid = state .resource_table - .add(WebGPUBindGroupLayout(bind_group_layout)); + .add(WebGpuBindGroupLayout(bind_group_layout)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -229,7 +229,7 @@ pub fn op_webgpu_create_pipeline_layout( let instance = state.borrow::<super::Instance>(); 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; @@ -238,7 +238,7 @@ pub fn op_webgpu_create_pipeline_layout( for rid in &args.bind_group_layouts { let bind_group_layout = state .resource_table - .get::<WebGPUBindGroupLayout>(*rid) + .get::<WebGpuBindGroupLayout>(*rid) .ok_or_else(bad_resource_id)?; bind_group_layouts.push(bind_group_layout.0); } @@ -257,17 +257,17 @@ pub fn op_webgpu_create_pipeline_layout( let rid = state .resource_table - .add(super::pipeline::WebGPUPipelineLayout(pipeline_layout)); + .add(super::pipeline::WebGpuPipelineLayout(pipeline_layout)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUBindGroupEntry { +struct GpuBindGroupEntry { binding: u32, kind: String, resource: u32, @@ -281,7 +281,7 @@ pub struct CreateBindGroupArgs { device_rid: ResourceId, label: Option<String>, layout: u32, - entries: Vec<GPUBindGroupEntry>, + entries: Vec<GpuBindGroupEntry>, } pub fn op_webgpu_create_bind_group( @@ -292,7 +292,7 @@ pub fn op_webgpu_create_bind_group( let instance = state.borrow::<super::Instance>(); 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; @@ -305,14 +305,14 @@ pub fn op_webgpu_create_bind_group( "GPUSampler" => { let sampler_resource = state .resource_table - .get::<super::sampler::WebGPUSampler>(entry.resource) + .get::<super::sampler::WebGpuSampler>(entry.resource) .ok_or_else(bad_resource_id)?; wgpu_core::binding_model::BindingResource::Sampler(sampler_resource.0) } "GPUTextureView" => { let texture_view_resource = state .resource_table - .get::<super::texture::WebGPUTextureView>(entry.resource) + .get::<super::texture::WebGpuTextureView>(entry.resource) .ok_or_else(bad_resource_id)?; wgpu_core::binding_model::BindingResource::TextureView( texture_view_resource.0, @@ -321,7 +321,7 @@ pub fn op_webgpu_create_bind_group( "GPUBufferBinding" => { let buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(entry.resource) + .get::<super::buffer::WebGpuBuffer>(entry.resource) .ok_or_else(bad_resource_id)?; wgpu_core::binding_model::BindingResource::Buffer( wgpu_core::binding_model::BufferBinding { @@ -339,7 +339,7 @@ pub fn op_webgpu_create_bind_group( let bind_group_layout = state .resource_table - .get::<WebGPUBindGroupLayout>(args.layout) + .get::<WebGpuBindGroupLayout>(args.layout) .ok_or_else(bad_resource_id)?; let descriptor = wgpu_core::binding_model::BindGroupDescriptor { @@ -354,10 +354,10 @@ pub fn op_webgpu_create_bind_group( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUBindGroup(bind_group)); + let rid = state.resource_table.add(WebGpuBindGroup(bind_group)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } diff --git a/op_crates/webgpu/buffer.rs b/op_crates/webgpu/buffer.rs index 6845279d6..91a44f214 100644 --- a/op_crates/webgpu/buffer.rs +++ b/op_crates/webgpu/buffer.rs @@ -15,18 +15,18 @@ use std::cell::RefCell; use std::rc::Rc; use std::time::Duration; -use super::error::DOMExceptionOperationError; -use super::error::WebGPUError; +use super::error::DomExceptionOperationError; +use super::error::WebGpuError; -pub(crate) struct WebGPUBuffer(pub(crate) wgpu_core::id::BufferId); -impl Resource for WebGPUBuffer { +pub(crate) struct WebGpuBuffer(pub(crate) wgpu_core::id::BufferId); +impl Resource for WebGpuBuffer { fn name(&self) -> Cow<str> { "webGPUBuffer".into() } } -struct WebGPUBufferMapped(*mut u8, usize); -impl Resource for WebGPUBufferMapped { +struct WebGpuBufferMapped(*mut u8, usize); +impl Resource for WebGpuBufferMapped { fn name(&self) -> Cow<str> { "webGPUBufferMapped".into() } @@ -50,7 +50,7 @@ pub fn op_webgpu_create_buffer( let instance = state.borrow::<super::Instance>(); 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; @@ -67,11 +67,11 @@ pub fn op_webgpu_create_buffer( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUBuffer(buffer)); + let rid = state.resource_table.add(WebGpuBuffer(buffer)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -98,12 +98,12 @@ pub async fn op_webgpu_buffer_get_map_async( let instance = state_.borrow::<super::Instance>(); let buffer_resource = state_ .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; let device_resource = state_ .resource_table - .get::<super::WebGPUDevice>(args.device_rid) + .get::<super::WebGpuDevice>(args.device_rid) .ok_or_else(bad_resource_id)?; device = device_resource.0; @@ -182,7 +182,7 @@ pub fn op_webgpu_buffer_get_mapped_range( let instance = state.borrow::<super::Instance>(); let buffer_resource = state .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; @@ -191,7 +191,7 @@ pub fn op_webgpu_buffer_get_mapped_range( args.offset, std::num::NonZeroU64::new(args.size) )) - .map_err(|e| DOMExceptionOperationError::new(&e.to_string()))?; + .map_err(|e| DomExceptionOperationError::new(&e.to_string()))?; let slice = unsafe { std::slice::from_raw_parts_mut(slice_pointer, args.size as usize) @@ -200,7 +200,7 @@ pub fn op_webgpu_buffer_get_mapped_range( let rid = state .resource_table - .add(WebGPUBufferMapped(slice_pointer, args.size as usize)); + .add(WebGpuBufferMapped(slice_pointer, args.size as usize)); Ok(json!({ "rid": rid, @@ -221,12 +221,12 @@ pub fn op_webgpu_buffer_unmap( ) -> Result<Value, AnyError> { let mapped_resource = state .resource_table - .take::<WebGPUBufferMapped>(args.mapped_rid) + .take::<WebGpuBufferMapped>(args.mapped_rid) .ok_or_else(bad_resource_id)?; let instance = state.borrow::<super::Instance>(); let buffer_resource = state .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; @@ -240,5 +240,5 @@ pub fn op_webgpu_buffer_unmap( let maybe_err = gfx_select!(buffer => instance.buffer_unmap(buffer)).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } 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( diff --git a/op_crates/webgpu/command_encoder.rs b/op_crates/webgpu/command_encoder.rs index 43d1d68f0..5ca26ccd0 100644 --- a/op_crates/webgpu/command_encoder.rs +++ b/op_crates/webgpu/command_encoder.rs @@ -11,21 +11,21 @@ use serde::Deserialize; use std::borrow::Cow; use std::cell::RefCell; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUCommandEncoder( +pub(crate) struct WebGpuCommandEncoder( pub(crate) wgpu_core::id::CommandEncoderId, ); -impl Resource for WebGPUCommandEncoder { +impl Resource for WebGpuCommandEncoder { fn name(&self) -> Cow<str> { "webGPUCommandEncoder".into() } } -pub(crate) struct WebGPUCommandBuffer( +pub(crate) struct WebGpuCommandBuffer( pub(crate) wgpu_core::id::CommandBufferId, ); -impl Resource for WebGPUCommandBuffer { +impl Resource for WebGpuCommandBuffer { fn name(&self) -> Cow<str> { "webGPUCommandBuffer".into() } @@ -55,7 +55,7 @@ pub fn op_webgpu_create_command_encoder( let instance = state.borrow::<super::Instance>(); 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; @@ -71,27 +71,27 @@ pub fn op_webgpu_create_command_encoder( let rid = state .resource_table - .add(WebGPUCommandEncoder(command_encoder)); + .add(WebGpuCommandEncoder(command_encoder)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from), + "err": maybe_err.map(WebGpuError::from), })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPURenderPassColorAttachment { +pub struct GpuRenderPassColorAttachment { view: u32, resolve_target: Option<u32>, load_op: String, - load_value: Option<super::render_pass::GPUColor>, + load_value: Option<super::render_pass::GpuColor>, store_op: Option<String>, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPURenderPassDepthStencilAttachment { +struct GpuRenderPassDepthStencilAttachment { view: u32, depth_load_op: String, depth_load_value: Option<f32>, @@ -108,8 +108,8 @@ struct GPURenderPassDepthStencilAttachment { pub struct CommandEncoderBeginRenderPassArgs { command_encoder_rid: ResourceId, label: Option<String>, - color_attachments: Vec<GPURenderPassColorAttachment>, - depth_stencil_attachment: Option<GPURenderPassDepthStencilAttachment>, + color_attachments: Vec<GpuRenderPassColorAttachment>, + depth_stencil_attachment: Option<GpuRenderPassDepthStencilAttachment>, _occlusion_query_set: Option<u32>, // not yet implemented } @@ -120,7 +120,7 @@ pub fn op_webgpu_command_encoder_begin_render_pass( ) -> Result<Value, AnyError> { let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let mut color_attachments = vec![]; @@ -128,7 +128,7 @@ pub fn op_webgpu_command_encoder_begin_render_pass( for color_attachment in args.color_attachments { let texture_view_resource = state .resource_table - .get::<super::texture::WebGPUTextureView>(color_attachment.view) + .get::<super::texture::WebGpuTextureView>(color_attachment.view) .ok_or_else(bad_resource_id)?; let attachment = wgpu_core::command::ColorAttachmentDescriptor { @@ -138,7 +138,7 @@ pub fn op_webgpu_command_encoder_begin_render_pass( .map(|rid| { state .resource_table - .get::<super::texture::WebGPUTextureView>(rid) + .get::<super::texture::WebGpuTextureView>(rid) .ok_or_else(bad_resource_id) }) .transpose()? @@ -180,7 +180,7 @@ pub fn op_webgpu_command_encoder_begin_render_pass( if let Some(attachment) = args.depth_stencil_attachment { let texture_view_resource = state .resource_table - .get::<super::texture::WebGPUTextureView>(attachment.view) + .get::<super::texture::WebGpuTextureView>(attachment.view) .ok_or_else(bad_resource_id)?; depth_stencil_attachment = @@ -232,7 +232,7 @@ pub fn op_webgpu_command_encoder_begin_render_pass( let rid = state .resource_table - .add(super::render_pass::WebGPURenderPass(RefCell::new( + .add(super::render_pass::WebGpuRenderPass(RefCell::new( render_pass, ))); @@ -255,7 +255,7 @@ pub fn op_webgpu_command_encoder_begin_compute_pass( ) -> Result<Value, AnyError> { let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let descriptor = wgpu_core::command::ComputePassDescriptor { @@ -269,7 +269,7 @@ pub fn op_webgpu_command_encoder_begin_compute_pass( let rid = state .resource_table - .add(super::compute_pass::WebGPUComputePass(RefCell::new( + .add(super::compute_pass::WebGpuComputePass(RefCell::new( compute_pass, ))); @@ -297,17 +297,17 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_buffer( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let source_buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.source) + .get::<super::buffer::WebGpuBuffer>(args.source) .ok_or_else(bad_resource_id)?; let source_buffer = source_buffer_resource.0; let destination_buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.destination) + .get::<super::buffer::WebGpuBuffer>(args.destination) .ok_or_else(bad_resource_id)?; let destination_buffer = destination_buffer_resource.0; @@ -320,12 +320,12 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_buffer( args.size )).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPUImageCopyBuffer { +pub struct GpuImageCopyBuffer { buffer: u32, offset: Option<u64>, bytes_per_row: Option<u32>, @@ -334,7 +334,7 @@ pub struct GPUImageCopyBuffer { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPUOrigin3D { +pub struct GpuOrigin3D { pub x: Option<u32>, pub y: Option<u32>, pub z: Option<u32>, @@ -342,10 +342,10 @@ pub struct GPUOrigin3D { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPUImageCopyTexture { +pub struct GpuImageCopyTexture { pub texture: u32, pub mip_level: Option<u32>, - pub origin: Option<GPUOrigin3D>, + pub origin: Option<GpuOrigin3D>, pub _aspect: Option<String>, // not yet implemented } @@ -353,9 +353,9 @@ pub struct GPUImageCopyTexture { #[serde(rename_all = "camelCase")] pub struct CommandEncoderCopyBufferToTextureArgs { command_encoder_rid: ResourceId, - source: GPUImageCopyBuffer, - destination: GPUImageCopyTexture, - copy_size: super::texture::GPUExtent3D, + source: GpuImageCopyBuffer, + destination: GpuImageCopyTexture, + copy_size: super::texture::GpuExtent3D, } pub fn op_webgpu_command_encoder_copy_buffer_to_texture( @@ -366,16 +366,16 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_texture( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let source_buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.source.buffer) + .get::<super::buffer::WebGpuBuffer>(args.source.buffer) .ok_or_else(bad_resource_id)?; let destination_texture_resource = state .resource_table - .get::<super::texture::WebGPUTexture>(args.destination.texture) + .get::<super::texture::WebGpuTexture>(args.destination.texture) .ok_or_else(bad_resource_id)?; let source = wgpu_core::command::BufferCopyView { @@ -409,16 +409,16 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_texture( } )).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct CommandEncoderCopyTextureToBufferArgs { command_encoder_rid: ResourceId, - source: GPUImageCopyTexture, - destination: GPUImageCopyBuffer, - copy_size: super::texture::GPUExtent3D, + source: GpuImageCopyTexture, + destination: GpuImageCopyBuffer, + copy_size: super::texture::GpuExtent3D, } pub fn op_webgpu_command_encoder_copy_texture_to_buffer( @@ -429,16 +429,16 @@ pub fn op_webgpu_command_encoder_copy_texture_to_buffer( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let source_texture_resource = state .resource_table - .get::<super::texture::WebGPUTexture>(args.source.texture) + .get::<super::texture::WebGpuTexture>(args.source.texture) .ok_or_else(bad_resource_id)?; let destination_buffer_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.destination.buffer) + .get::<super::buffer::WebGpuBuffer>(args.destination.buffer) .ok_or_else(bad_resource_id)?; let source = wgpu_core::command::TextureCopyView { @@ -471,16 +471,16 @@ pub fn op_webgpu_command_encoder_copy_texture_to_buffer( } )).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct CommandEncoderCopyTextureToTextureArgs { command_encoder_rid: ResourceId, - source: GPUImageCopyTexture, - destination: GPUImageCopyTexture, - copy_size: super::texture::GPUExtent3D, + source: GpuImageCopyTexture, + destination: GpuImageCopyTexture, + copy_size: super::texture::GpuExtent3D, } pub fn op_webgpu_command_encoder_copy_texture_to_texture( @@ -491,16 +491,16 @@ pub fn op_webgpu_command_encoder_copy_texture_to_texture( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let source_texture_resource = state .resource_table - .get::<super::texture::WebGPUTexture>(args.source.texture) + .get::<super::texture::WebGpuTexture>(args.source.texture) .ok_or_else(bad_resource_id)?; let destination_texture_resource = state .resource_table - .get::<super::texture::WebGPUTexture>(args.destination.texture) + .get::<super::texture::WebGpuTexture>(args.destination.texture) .ok_or_else(bad_resource_id)?; let source = wgpu_core::command::TextureCopyView { @@ -537,7 +537,7 @@ pub fn op_webgpu_command_encoder_copy_texture_to_texture( } )).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -555,7 +555,7 @@ pub fn op_webgpu_command_encoder_push_debug_group( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; @@ -563,7 +563,7 @@ pub fn op_webgpu_command_encoder_push_debug_group( .command_encoder_push_debug_group(command_encoder, &args.group_label)) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -580,13 +580,13 @@ pub fn op_webgpu_command_encoder_pop_debug_group( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let maybe_err = gfx_select!(command_encoder => instance.command_encoder_pop_debug_group(command_encoder)).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -604,7 +604,7 @@ pub fn op_webgpu_command_encoder_insert_debug_marker( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; @@ -613,7 +613,7 @@ pub fn op_webgpu_command_encoder_insert_debug_marker( &args.marker_label )).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -632,12 +632,12 @@ pub fn op_webgpu_command_encoder_write_timestamp( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(args.query_set) .ok_or_else(bad_resource_id)?; let maybe_err = @@ -648,7 +648,7 @@ pub fn op_webgpu_command_encoder_write_timestamp( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -670,16 +670,16 @@ pub fn op_webgpu_command_encoder_resolve_query_set( let instance = state.borrow::<super::Instance>(); let command_encoder_resource = state .resource_table - .get::<WebGPUCommandEncoder>(args.command_encoder_rid) + .get::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(args.query_set) .ok_or_else(bad_resource_id)?; let destination_resource = state .resource_table - .get::<super::buffer::WebGPUBuffer>(args.destination) + .get::<super::buffer::WebGpuBuffer>(args.destination) .ok_or_else(bad_resource_id)?; let maybe_err = @@ -693,7 +693,7 @@ pub fn op_webgpu_command_encoder_resolve_query_set( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -710,7 +710,7 @@ pub fn op_webgpu_command_encoder_finish( ) -> Result<Value, AnyError> { let command_encoder_resource = state .resource_table - .take::<WebGPUCommandEncoder>(args.command_encoder_rid) + .take::<WebGpuCommandEncoder>(args.command_encoder_rid) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let instance = state.borrow::<super::Instance>(); @@ -726,10 +726,10 @@ pub fn op_webgpu_command_encoder_finish( let rid = state .resource_table - .add(WebGPUCommandBuffer(command_buffer)); + .add(WebGpuCommandBuffer(command_buffer)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } 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<wgpu_core::command::ComputePass>, ); -impl Resource for WebGPUComputePass { +impl Resource for WebGpuComputePass { fn name(&self) -> Cow<str> { "webGPUComputePass".into() } @@ -36,11 +36,11 @@ pub fn op_webgpu_compute_pass_set_pipeline( ) -> Result<Value, AnyError> { let compute_pipeline_resource = state .resource_table - .get::<super::pipeline::WebGPUComputePipeline>(args.pipeline) + .get::<super::pipeline::WebGpuComputePipeline>(args.pipeline) .ok_or_else(bad_resource_id)?; let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<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 compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -184,11 +184,11 @@ pub fn op_webgpu_compute_pass_write_timestamp( ) -> Result<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(args.query_set) .ok_or_else(bad_resource_id)?; unsafe { @@ -216,14 +216,14 @@ pub fn op_webgpu_compute_pass_end_pass( ) -> Result<Value, AnyError> { let command_encoder_resource = state .resource_table - .get::<super::command_encoder::WebGPUCommandEncoder>( + .get::<super::command_encoder::WebGpuCommandEncoder>( 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::<WebGPUComputePass>(args.compute_pass_rid) + .take::<WebGpuComputePass>(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; let compute_pass = &compute_pass_resource.0.borrow(); let instance = state.borrow::<super::Instance>(); @@ -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<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 compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(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<Value, AnyError> { let compute_pass_resource = state .resource_table - .get::<WebGPUComputePass>(args.compute_pass_rid) + .get::<WebGpuComputePass>(args.compute_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { diff --git a/op_crates/webgpu/error.rs b/op_crates/webgpu/error.rs index e793dabfa..52741d984 100644 --- a/op_crates/webgpu/error.rs +++ b/op_crates/webgpu/error.rs @@ -29,81 +29,81 @@ use wgpu_core::resource::CreateTextureViewError; #[derive(Serialize)] #[serde(tag = "type", content = "value")] #[serde(rename_all = "kebab-case")] -pub enum WebGPUError { +pub enum WebGpuError { Lost, OutOfMemory, Validation(String), } -impl From<CreateBufferError> for WebGPUError { +impl From<CreateBufferError> for WebGpuError { fn from(err: CreateBufferError) -> Self { match err { CreateBufferError::Device(err) => err.into(), CreateBufferError::AccessError(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<DeviceError> for WebGPUError { +impl From<DeviceError> for WebGpuError { fn from(err: DeviceError) -> Self { match err { - DeviceError::Lost => WebGPUError::Lost, - DeviceError::OutOfMemory => WebGPUError::OutOfMemory, - DeviceError::Invalid => WebGPUError::Validation(err.to_string()), + DeviceError::Lost => WebGpuError::Lost, + DeviceError::OutOfMemory => WebGpuError::OutOfMemory, + DeviceError::Invalid => WebGpuError::Validation(err.to_string()), } } } -impl From<BufferAccessError> for WebGPUError { +impl From<BufferAccessError> for WebGpuError { fn from(err: BufferAccessError) -> Self { match err { BufferAccessError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreateBindGroupLayoutError> for WebGPUError { +impl From<CreateBindGroupLayoutError> for WebGpuError { fn from(err: CreateBindGroupLayoutError) -> Self { match err { CreateBindGroupLayoutError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreatePipelineLayoutError> for WebGPUError { +impl From<CreatePipelineLayoutError> for WebGpuError { fn from(err: CreatePipelineLayoutError) -> Self { match err { CreatePipelineLayoutError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreateBindGroupError> for WebGPUError { +impl From<CreateBindGroupError> for WebGpuError { fn from(err: CreateBindGroupError) -> Self { match err { CreateBindGroupError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<RenderBundleError> for WebGPUError { +impl From<RenderBundleError> for WebGpuError { fn from(err: RenderBundleError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CreateRenderBundleError> for WebGPUError { +impl From<CreateRenderBundleError> for WebGpuError { fn from(err: CreateRenderBundleError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CommandAllocatorError> for WebGPUError { +impl From<CommandAllocatorError> for WebGpuError { fn from(err: CommandAllocatorError) -> Self { match err { CommandAllocatorError::Device(err) => err.into(), @@ -111,142 +111,142 @@ impl From<CommandAllocatorError> for WebGPUError { } } -impl From<CopyError> for WebGPUError { +impl From<CopyError> for WebGpuError { fn from(err: CopyError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CommandEncoderError> for WebGPUError { +impl From<CommandEncoderError> for WebGpuError { fn from(err: CommandEncoderError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<QueryError> for WebGPUError { +impl From<QueryError> for WebGpuError { fn from(err: QueryError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<ComputePassError> for WebGPUError { +impl From<ComputePassError> for WebGpuError { fn from(err: ComputePassError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CreateComputePipelineError> for WebGPUError { +impl From<CreateComputePipelineError> for WebGpuError { fn from(err: CreateComputePipelineError) -> Self { match err { CreateComputePipelineError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<GetBindGroupLayoutError> for WebGPUError { +impl From<GetBindGroupLayoutError> for WebGpuError { fn from(err: GetBindGroupLayoutError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CreateRenderPipelineError> for WebGPUError { +impl From<CreateRenderPipelineError> for WebGpuError { fn from(err: CreateRenderPipelineError) -> Self { match err { CreateRenderPipelineError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<RenderPassError> for WebGPUError { +impl From<RenderPassError> for WebGpuError { fn from(err: RenderPassError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CreateSamplerError> for WebGPUError { +impl From<CreateSamplerError> for WebGpuError { fn from(err: CreateSamplerError) -> Self { match err { CreateSamplerError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreateShaderModuleError> for WebGPUError { +impl From<CreateShaderModuleError> for WebGpuError { fn from(err: CreateShaderModuleError) -> Self { match err { CreateShaderModuleError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreateTextureError> for WebGPUError { +impl From<CreateTextureError> for WebGpuError { fn from(err: CreateTextureError) -> Self { match err { CreateTextureError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<CreateTextureViewError> for WebGPUError { +impl From<CreateTextureViewError> for WebGpuError { fn from(err: CreateTextureViewError) -> Self { - WebGPUError::Validation(err.to_string()) + WebGpuError::Validation(err.to_string()) } } -impl From<CreateQuerySetError> for WebGPUError { +impl From<CreateQuerySetError> for WebGpuError { fn from(err: CreateQuerySetError) -> Self { match err { CreateQuerySetError::Device(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<QueueSubmitError> for WebGPUError { +impl From<QueueSubmitError> for WebGpuError { fn from(err: QueueSubmitError) -> Self { match err { QueueSubmitError::Queue(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } -impl From<QueueWriteError> for WebGPUError { +impl From<QueueWriteError> for WebGpuError { fn from(err: QueueWriteError) -> Self { match err { QueueWriteError::Queue(err) => err.into(), - err => WebGPUError::Validation(err.to_string()), + err => WebGpuError::Validation(err.to_string()), } } } #[derive(Debug)] -pub struct DOMExceptionOperationError { +pub struct DomExceptionOperationError { pub msg: String, } -impl DOMExceptionOperationError { +impl DomExceptionOperationError { pub fn new(msg: &str) -> Self { - DOMExceptionOperationError { + DomExceptionOperationError { msg: msg.to_string(), } } } -impl fmt::Display for DOMExceptionOperationError { +impl fmt::Display for DomExceptionOperationError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad(&self.msg) } } -impl std::error::Error for DOMExceptionOperationError {} +impl std::error::Error for DomExceptionOperationError {} pub fn get_error_class_name(e: &AnyError) -> Option<&'static str> { - e.downcast_ref::<DOMExceptionOperationError>() + e.downcast_ref::<DomExceptionOperationError>() .map(|_| "DOMExceptionOperationError") } diff --git a/op_crates/webgpu/lib.rs b/op_crates/webgpu/lib.rs index 046472905..5c3b99329 100644 --- a/op_crates/webgpu/lib.rs +++ b/op_crates/webgpu/lib.rs @@ -18,8 +18,8 @@ use std::rc::Rc; pub use wgpu_core; pub use wgpu_types; -use error::DOMExceptionOperationError; -use error::WebGPUError; +use error::DomExceptionOperationError; +use error::WebGpuError; #[macro_use] mod macros { @@ -71,22 +71,22 @@ fn check_unstable(state: &OpState, api_name: &str) { type Instance = wgpu_core::hub::Global<wgpu_core::hub::IdentityManagerFactory>; -struct WebGPUAdapter(wgpu_core::id::AdapterId); -impl Resource for WebGPUAdapter { +struct WebGpuAdapter(wgpu_core::id::AdapterId); +impl Resource for WebGpuAdapter { fn name(&self) -> Cow<str> { "webGPUAdapter".into() } } -struct WebGPUDevice(wgpu_core::id::DeviceId); -impl Resource for WebGPUDevice { +struct WebGpuDevice(wgpu_core::id::DeviceId); +impl Resource for WebGpuDevice { fn name(&self) -> Cow<str> { "webGPUDevice".into() } } -struct WebGPUQuerySet(wgpu_core::id::QuerySetId); -impl Resource for WebGPUQuerySet { +struct WebGpuQuerySet(wgpu_core::id::QuerySetId); +impl Resource for WebGpuQuerySet { fn name(&self) -> Cow<str> { "webGPUQuerySet".into() } @@ -255,7 +255,7 @@ pub async fn op_webgpu_request_adapter( "maxUniformBufferBindingSize": adapter_limits.max_uniform_buffer_binding_size }); - let rid = state.resource_table.add(WebGPUAdapter(adapter)); + let rid = state.resource_table.add(WebGpuAdapter(adapter)); Ok(json!({ "rid": rid, @@ -267,7 +267,7 @@ pub async fn op_webgpu_request_adapter( #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPULimits { +struct GpuLimits { _max_texture_dimension1d: Option<u32>, _max_texture_dimension2d: Option<u32>, _max_texture_dimension3d: Option<u32>, @@ -293,7 +293,7 @@ pub struct RequestDeviceArgs { adapter_rid: ResourceId, label: Option<String>, non_guaranteed_features: Option<Vec<String>>, - non_guaranteed_limits: Option<GPULimits>, + non_guaranteed_limits: Option<GpuLimits>, } pub async fn op_webgpu_request_device( @@ -304,7 +304,7 @@ pub async fn op_webgpu_request_device( let mut state = state.borrow_mut(); let adapter_resource = state .resource_table - .get::<WebGPUAdapter>(args.adapter_rid) + .get::<WebGpuAdapter>(args.adapter_rid) .ok_or_else(bad_resource_id)?; let adapter = adapter_resource.0; let instance = state.borrow::<Instance>(); @@ -430,7 +430,7 @@ pub async fn op_webgpu_request_device( std::marker::PhantomData )); if let Some(err) = maybe_err { - return Err(DOMExceptionOperationError::new(&err.to_string()).into()); + return Err(DomExceptionOperationError::new(&err.to_string()).into()); } let device_features = @@ -449,7 +449,7 @@ pub async fn op_webgpu_request_device( "maxUniformBufferBindingSize": limits.max_uniform_buffer_binding_size, }); - let rid = state.resource_table.add(WebGPUDevice(device)); + let rid = state.resource_table.add(WebGpuDevice(device)); Ok(json!({ "rid": rid, @@ -476,7 +476,7 @@ pub fn op_webgpu_create_query_set( ) -> Result<Value, AnyError> { let device_resource = state .resource_table - .get::<WebGPUDevice>(args.device_rid) + .get::<WebGpuDevice>(args.device_rid) .ok_or_else(bad_resource_id)?; let device = device_resource.0; let instance = &state.borrow::<Instance>(); @@ -542,10 +542,10 @@ pub fn op_webgpu_create_query_set( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUQuerySet(query_set)); + let rid = state.resource_table.add(WebGpuQuerySet(query_set)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from), + "err": maybe_err.map(WebGpuError::from), })) } diff --git a/op_crates/webgpu/pipeline.rs b/op_crates/webgpu/pipeline.rs index d63bc7692..5e9d4534b 100644 --- a/op_crates/webgpu/pipeline.rs +++ b/op_crates/webgpu/pipeline.rs @@ -10,30 +10,30 @@ use deno_core::{OpState, Resource}; use serde::Deserialize; use std::borrow::Cow; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUPipelineLayout( +pub(crate) struct WebGpuPipelineLayout( pub(crate) wgpu_core::id::PipelineLayoutId, ); -impl Resource for WebGPUPipelineLayout { +impl Resource for WebGpuPipelineLayout { fn name(&self) -> Cow<str> { "webGPUPipelineLayout".into() } } -pub(crate) struct WebGPUComputePipeline( +pub(crate) struct WebGpuComputePipeline( pub(crate) wgpu_core::id::ComputePipelineId, ); -impl Resource for WebGPUComputePipeline { +impl Resource for WebGpuComputePipeline { fn name(&self) -> Cow<str> { "webGPUComputePipeline".into() } } -pub(crate) struct WebGPURenderPipeline( +pub(crate) struct WebGpuRenderPipeline( pub(crate) wgpu_core::id::RenderPipelineId, ); -impl Resource for WebGPURenderPipeline { +impl Resource for WebGpuRenderPipeline { fn name(&self) -> Cow<str> { "webGPURenderPipeline".into() } @@ -64,7 +64,7 @@ fn serialize_stencil_operation( } fn serialize_stencil_face_state( - state: GPUStencilFaceState, + state: GpuStencilFaceState, ) -> wgpu_types::StencilFaceState { wgpu_types::StencilFaceState { compare: state @@ -114,7 +114,7 @@ fn serialize_blend_factor(blend_factor: &str) -> wgpu_types::BlendFactor { } fn serialize_blend_component( - blend: GPUBlendComponent, + blend: GpuBlendComponent, ) -> wgpu_types::BlendState { wgpu_types::BlendState { src_factor: blend @@ -145,7 +145,7 @@ fn serialize_blend_component( #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUProgrammableStage { +struct GpuProgrammableStage { module: u32, entry_point: String, } @@ -156,7 +156,7 @@ pub struct CreateComputePipelineArgs { device_rid: ResourceId, label: Option<String>, layout: Option<u32>, - compute: GPUProgrammableStage, + compute: GpuProgrammableStage, } pub fn op_webgpu_create_compute_pipeline( @@ -167,14 +167,14 @@ pub fn op_webgpu_create_compute_pipeline( let instance = state.borrow::<super::Instance>(); 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; let pipeline_layout = if let Some(rid) = args.layout { let id = state .resource_table - .get::<WebGPUPipelineLayout>(rid) + .get::<WebGpuPipelineLayout>(rid) .ok_or_else(bad_resource_id)?; Some(id.0) } else { @@ -183,7 +183,7 @@ pub fn op_webgpu_create_compute_pipeline( let compute_shader_module_resource = state .resource_table - .get::<super::shader::WebGPUShaderModule>(args.compute.module) + .get::<super::shader::WebGpuShaderModule>(args.compute.module) .ok_or_else(bad_resource_id)?; let descriptor = wgpu_core::pipeline::ComputePipelineDescriptor { @@ -211,11 +211,11 @@ pub fn op_webgpu_create_compute_pipeline( let rid = state .resource_table - .add(WebGPUComputePipeline(compute_pipeline)); + .add(WebGpuComputePipeline(compute_pipeline)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from), + "err": maybe_err.map(WebGpuError::from), })) } @@ -234,7 +234,7 @@ pub fn op_webgpu_compute_pipeline_get_bind_group_layout( let instance = state.borrow::<super::Instance>(); let compute_pipeline_resource = state .resource_table - .get::<WebGPUComputePipeline>(args.compute_pipeline_rid) + .get::<WebGpuComputePipeline>(args.compute_pipeline_rid) .ok_or_else(bad_resource_id)?; let compute_pipeline = compute_pipeline_resource.0; @@ -244,18 +244,18 @@ pub fn op_webgpu_compute_pipeline_get_bind_group_layout( let rid = state .resource_table - .add(super::binding::WebGPUBindGroupLayout(bind_group_layout)); + .add(super::binding::WebGpuBindGroupLayout(bind_group_layout)); Ok(json!({ "rid": rid, "label": label, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUPrimitiveState { +struct GpuPrimitiveState { topology: Option<String>, strip_index_format: Option<String>, front_face: Option<String>, @@ -264,7 +264,7 @@ struct GPUPrimitiveState { #[derive(Deserialize, Clone)] #[serde(rename_all = "camelCase")] -struct GPUBlendComponent { +struct GpuBlendComponent { src_factor: Option<String>, dst_factor: Option<String>, operation: Option<String>, @@ -272,22 +272,22 @@ struct GPUBlendComponent { #[derive(Deserialize, Clone)] #[serde(rename_all = "camelCase")] -struct GPUBlendState { - color: GPUBlendComponent, - alpha: GPUBlendComponent, +struct GpuBlendState { + color: GpuBlendComponent, + alpha: GpuBlendComponent, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUColorTargetState { +struct GpuColorTargetState { format: String, - blend: Option<GPUBlendState>, + blend: Option<GpuBlendState>, write_mask: Option<u32>, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUStencilFaceState { +struct GpuStencilFaceState { compare: Option<String>, fail_op: Option<String>, depth_fail_op: Option<String>, @@ -296,12 +296,12 @@ struct GPUStencilFaceState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUDepthStencilState { +struct GpuDepthStencilState { format: String, depth_write_enabled: Option<bool>, depth_compare: Option<String>, - stencil_front: Option<GPUStencilFaceState>, - stencil_back: Option<GPUStencilFaceState>, + stencil_front: Option<GpuStencilFaceState>, + stencil_back: Option<GpuStencilFaceState>, stencil_read_mask: Option<u32>, stencil_write_mask: Option<u32>, depth_bias: Option<i32>, @@ -312,7 +312,7 @@ struct GPUDepthStencilState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUVertexAttribute { +struct GpuVertexAttribute { format: String, offset: u64, shader_location: u32, @@ -320,23 +320,23 @@ struct GPUVertexAttribute { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUVertexBufferLayout { +struct GpuVertexBufferLayout { array_stride: u64, step_mode: Option<String>, - attributes: Vec<GPUVertexAttribute>, + attributes: Vec<GpuVertexAttribute>, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUVertexState { +struct GpuVertexState { module: u32, entry_point: String, - buffers: Option<Vec<Option<GPUVertexBufferLayout>>>, + buffers: Option<Vec<Option<GpuVertexBufferLayout>>>, } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUMultisampleState { +struct GpuMultisampleState { count: Option<u32>, mask: Option<u64>, // against spec, but future proof alpha_to_coverage_enabled: Option<bool>, @@ -344,8 +344,8 @@ struct GPUMultisampleState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUFragmentState { - targets: Vec<GPUColorTargetState>, +struct GpuFragmentState { + targets: Vec<GpuColorTargetState>, module: u32, entry_point: String, } @@ -356,11 +356,11 @@ pub struct CreateRenderPipelineArgs { device_rid: ResourceId, label: Option<String>, layout: Option<u32>, - vertex: GPUVertexState, - primitive: Option<GPUPrimitiveState>, - depth_stencil: Option<GPUDepthStencilState>, - multisample: Option<GPUMultisampleState>, - fragment: Option<GPUFragmentState>, + vertex: GpuVertexState, + primitive: Option<GpuPrimitiveState>, + depth_stencil: Option<GpuDepthStencilState>, + multisample: Option<GpuMultisampleState>, + fragment: Option<GpuFragmentState>, } pub fn op_webgpu_create_render_pipeline( @@ -371,14 +371,14 @@ pub fn op_webgpu_create_render_pipeline( let instance = state.borrow::<super::Instance>(); 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; let layout = if let Some(rid) = args.layout { let pipeline_layout_resource = state .resource_table - .get::<WebGPUPipelineLayout>(rid) + .get::<WebGpuPipelineLayout>(rid) .ok_or_else(bad_resource_id)?; Some(pipeline_layout_resource.0) } else { @@ -387,7 +387,7 @@ pub fn op_webgpu_create_render_pipeline( let vertex_shader_module_resource = state .resource_table - .get::<super::shader::WebGPUShaderModule>(args.vertex.module) + .get::<super::shader::WebGpuShaderModule>(args.vertex.module) .ok_or_else(bad_resource_id)?; let descriptor = wgpu_core::pipeline::RenderPipelineDescriptor { @@ -400,63 +400,61 @@ pub fn op_webgpu_create_render_pipeline( }, buffers: Cow::from(if let Some(buffers) = args.vertex.buffers { let mut return_buffers = vec![]; - for buffer in buffers { - if let Some(buffer) = buffer { - return_buffers.push(wgpu_core::pipeline::VertexBufferLayout { - array_stride: buffer.array_stride, - step_mode: match buffer.step_mode { - Some(step_mode) => match step_mode.as_str() { - "vertex" => wgpu_types::InputStepMode::Vertex, - "instance" => wgpu_types::InputStepMode::Instance, - _ => unreachable!(), - }, - None => wgpu_types::InputStepMode::Vertex, + for buffer in buffers.into_iter().flatten() { + return_buffers.push(wgpu_core::pipeline::VertexBufferLayout { + array_stride: buffer.array_stride, + step_mode: match buffer.step_mode { + Some(step_mode) => match step_mode.as_str() { + "vertex" => wgpu_types::InputStepMode::Vertex, + "instance" => wgpu_types::InputStepMode::Instance, + _ => unreachable!(), }, - attributes: Cow::from( - buffer - .attributes - .iter() - .map(|attribute| wgpu_types::VertexAttribute { - format: match attribute.format.as_str() { - "uchar2" => wgpu_types::VertexFormat::Uchar2, - "uchar4" => wgpu_types::VertexFormat::Uchar4, - "char2" => wgpu_types::VertexFormat::Char2, - "char4" => wgpu_types::VertexFormat::Char4, - "uchar2norm" => wgpu_types::VertexFormat::Uchar2Norm, - "uchar4norm" => wgpu_types::VertexFormat::Uchar4, - "char2norm" => wgpu_types::VertexFormat::Char2Norm, - "char4norm" => wgpu_types::VertexFormat::Char4Norm, - "ushort2" => wgpu_types::VertexFormat::Ushort2, - "ushort4" => wgpu_types::VertexFormat::Ushort4, - "short2" => wgpu_types::VertexFormat::Short2, - "short4" => wgpu_types::VertexFormat::Short4, - "ushort2norm" => wgpu_types::VertexFormat::Ushort2Norm, - "ushort4norm" => wgpu_types::VertexFormat::Ushort4Norm, - "short2norm" => wgpu_types::VertexFormat::Short2Norm, - "short4norm" => wgpu_types::VertexFormat::Short4Norm, - "half2" => wgpu_types::VertexFormat::Half2, - "half4" => wgpu_types::VertexFormat::Half4, - "float" => wgpu_types::VertexFormat::Float, - "float2" => wgpu_types::VertexFormat::Float2, - "float3" => wgpu_types::VertexFormat::Float3, - "float4" => wgpu_types::VertexFormat::Float4, - "uint" => wgpu_types::VertexFormat::Uint, - "uint2" => wgpu_types::VertexFormat::Uint2, - "uint3" => wgpu_types::VertexFormat::Uint3, - "uint4" => wgpu_types::VertexFormat::Uint4, - "int" => wgpu_types::VertexFormat::Int, - "int2" => wgpu_types::VertexFormat::Int2, - "int3" => wgpu_types::VertexFormat::Int3, - "int4" => wgpu_types::VertexFormat::Int4, - _ => unreachable!(), - }, - offset: attribute.offset, - shader_location: attribute.shader_location, - }) - .collect::<Vec<wgpu_types::VertexAttribute>>(), - ), - }) - } + None => wgpu_types::InputStepMode::Vertex, + }, + attributes: Cow::from( + buffer + .attributes + .iter() + .map(|attribute| wgpu_types::VertexAttribute { + format: match attribute.format.as_str() { + "uchar2" => wgpu_types::VertexFormat::Uchar2, + "uchar4" => wgpu_types::VertexFormat::Uchar4, + "char2" => wgpu_types::VertexFormat::Char2, + "char4" => wgpu_types::VertexFormat::Char4, + "uchar2norm" => wgpu_types::VertexFormat::Uchar2Norm, + "uchar4norm" => wgpu_types::VertexFormat::Uchar4, + "char2norm" => wgpu_types::VertexFormat::Char2Norm, + "char4norm" => wgpu_types::VertexFormat::Char4Norm, + "ushort2" => wgpu_types::VertexFormat::Ushort2, + "ushort4" => wgpu_types::VertexFormat::Ushort4, + "short2" => wgpu_types::VertexFormat::Short2, + "short4" => wgpu_types::VertexFormat::Short4, + "ushort2norm" => wgpu_types::VertexFormat::Ushort2Norm, + "ushort4norm" => wgpu_types::VertexFormat::Ushort4Norm, + "short2norm" => wgpu_types::VertexFormat::Short2Norm, + "short4norm" => wgpu_types::VertexFormat::Short4Norm, + "half2" => wgpu_types::VertexFormat::Half2, + "half4" => wgpu_types::VertexFormat::Half4, + "float" => wgpu_types::VertexFormat::Float, + "float2" => wgpu_types::VertexFormat::Float2, + "float3" => wgpu_types::VertexFormat::Float3, + "float4" => wgpu_types::VertexFormat::Float4, + "uint" => wgpu_types::VertexFormat::Uint, + "uint2" => wgpu_types::VertexFormat::Uint2, + "uint3" => wgpu_types::VertexFormat::Uint3, + "uint4" => wgpu_types::VertexFormat::Uint4, + "int" => wgpu_types::VertexFormat::Int, + "int2" => wgpu_types::VertexFormat::Int2, + "int3" => wgpu_types::VertexFormat::Int3, + "int4" => wgpu_types::VertexFormat::Int4, + _ => unreachable!(), + }, + offset: attribute.offset, + shader_location: attribute.shader_location, + }) + .collect::<Vec<wgpu_types::VertexAttribute>>(), + ), + }); } return_buffers } else { @@ -540,7 +538,7 @@ pub fn op_webgpu_create_render_pipeline( fragment: args.fragment.map(|fragment| { let fragment_shader_module_resource = state .resource_table - .get::<super::shader::WebGPUShaderModule>(fragment.module) + .get::<super::shader::WebGpuShaderModule>(fragment.module) .ok_or_else(bad_resource_id) .unwrap(); @@ -601,11 +599,11 @@ pub fn op_webgpu_create_render_pipeline( let rid = state .resource_table - .add(WebGPURenderPipeline(render_pipeline)); + .add(WebGpuRenderPipeline(render_pipeline)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -624,7 +622,7 @@ pub fn op_webgpu_render_pipeline_get_bind_group_layout( let instance = state.borrow::<super::Instance>(); let render_pipeline_resource = state .resource_table - .get::<WebGPURenderPipeline>(args.render_pipeline_rid) + .get::<WebGpuRenderPipeline>(args.render_pipeline_rid) .ok_or_else(bad_resource_id)?; let render_pipeline = render_pipeline_resource.0; @@ -634,11 +632,11 @@ pub fn op_webgpu_render_pipeline_get_bind_group_layout( let rid = state .resource_table - .add(super::binding::WebGPUBindGroupLayout(bind_group_layout)); + .add(super::binding::WebGpuBindGroupLayout(bind_group_layout)); Ok(json!({ "rid": rid, "label": label, - "err": maybe_err.map(WebGPUError::from), + "err": maybe_err.map(WebGpuError::from), })) } diff --git a/op_crates/webgpu/queue.rs b/op_crates/webgpu/queue.rs index d878d5fcb..bbfb782de 100644 --- a/op_crates/webgpu/queue.rs +++ b/op_crates/webgpu/queue.rs @@ -9,9 +9,9 @@ use deno_core::ResourceId; use deno_core::ZeroCopyBuf; use serde::Deserialize; -use super::error::WebGPUError; +use super::error::WebGpuError; -type WebGPUQueue = super::WebGPUDevice; +type WebGpuQueue = super::WebGpuDevice; #[derive(Deserialize)] #[serde(rename_all = "camelCase")] @@ -28,7 +28,7 @@ pub fn op_webgpu_queue_submit( let instance = state.borrow::<super::Instance>(); let queue_resource = state .resource_table - .get::<WebGPUQueue>(args.queue_rid) + .get::<WebGpuQueue>(args.queue_rid) .ok_or_else(bad_resource_id)?; let queue = queue_resource.0; @@ -37,7 +37,7 @@ pub fn op_webgpu_queue_submit( for rid in args.command_buffers { let buffer_resource = state .resource_table - .get::<super::command_encoder::WebGPUCommandBuffer>(rid) + .get::<super::command_encoder::WebGpuCommandBuffer>(rid) .ok_or_else(bad_resource_id)?; ids.push(buffer_resource.0); } @@ -45,12 +45,12 @@ 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(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct GPUImageDataLayout { +struct GpuImageDataLayout { offset: Option<u64>, bytes_per_row: Option<u32>, rows_per_image: Option<u32>, @@ -74,12 +74,12 @@ pub fn op_webgpu_write_buffer( let instance = state.borrow::<super::Instance>(); 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 buffer = buffer_resource.0; let queue_resource = state .resource_table - .get::<WebGPUQueue>(args.queue_rid) + .get::<WebGpuQueue>(args.queue_rid) .ok_or_else(bad_resource_id)?; let queue = queue_resource.0; @@ -95,16 +95,16 @@ pub fn op_webgpu_write_buffer( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct QueueWriteTextureArgs { queue_rid: ResourceId, - destination: super::command_encoder::GPUImageCopyTexture, - data_layout: GPUImageDataLayout, - size: super::texture::GPUExtent3D, + destination: super::command_encoder::GpuImageCopyTexture, + data_layout: GpuImageDataLayout, + size: super::texture::GpuExtent3D, } pub fn op_webgpu_write_texture( @@ -115,11 +115,11 @@ pub fn op_webgpu_write_texture( let instance = state.borrow::<super::Instance>(); let texture_resource = state .resource_table - .get::<super::texture::WebGPUTexture>(args.destination.texture) + .get::<super::texture::WebGpuTexture>(args.destination.texture) .ok_or_else(bad_resource_id)?; let queue_resource = state .resource_table - .get::<WebGPUQueue>(args.queue_rid) + .get::<WebGpuQueue>(args.queue_rid) .ok_or_else(bad_resource_id)?; let queue = queue_resource.0; @@ -154,5 +154,5 @@ pub fn op_webgpu_write_texture( )) .err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } diff --git a/op_crates/webgpu/render_pass.rs b/op_crates/webgpu/render_pass.rs index 4829f2b1c..5c614024e 100644 --- a/op_crates/webgpu/render_pass.rs +++ b/op_crates/webgpu/render_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 WebGPURenderPass( +pub(crate) struct WebGpuRenderPass( pub(crate) RefCell<wgpu_core::command::RenderPass>, ); -impl Resource for WebGPURenderPass { +impl Resource for WebGpuRenderPass { fn name(&self) -> Cow<str> { "webGPURenderPass".into() } @@ -41,7 +41,7 @@ pub fn op_webgpu_render_pass_set_viewport( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_viewport( @@ -74,7 +74,7 @@ pub fn op_webgpu_render_pass_set_scissor_rect( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_scissor_rect( @@ -90,7 +90,7 @@ pub fn op_webgpu_render_pass_set_scissor_rect( #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPUColor { +pub struct GpuColor { pub r: f64, pub g: f64, pub b: f64, @@ -101,7 +101,7 @@ pub struct GPUColor { #[serde(rename_all = "camelCase")] pub struct RenderPassSetBlendColorArgs { render_pass_rid: ResourceId, - color: GPUColor, + color: GpuColor, } pub fn op_webgpu_render_pass_set_blend_color( @@ -111,7 +111,7 @@ pub fn op_webgpu_render_pass_set_blend_color( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_blend_color( @@ -141,7 +141,7 @@ pub fn op_webgpu_render_pass_set_stencil_reference( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_stencil_reference( @@ -167,11 +167,11 @@ pub fn op_webgpu_render_pass_begin_pipeline_statistics_query( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(args.query_set) .ok_or_else(bad_resource_id)?; unsafe { @@ -198,7 +198,7 @@ pub fn op_webgpu_render_pass_end_pipeline_statistics_query( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -225,11 +225,11 @@ pub fn op_webgpu_render_pass_write_timestamp( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; let query_set_resource = state .resource_table - .get::<super::WebGPUQuerySet>(args.query_set) + .get::<super::WebGpuQuerySet>(args.query_set) .ok_or_else(bad_resource_id)?; unsafe { @@ -260,14 +260,14 @@ pub fn op_webgpu_render_pass_execute_bundles( for rid in &args.bundles { let render_bundle_resource = state .resource_table - .get::<super::bundle::WebGPURenderBundle>(*rid) + .get::<super::bundle::WebGpuRenderBundle>(*rid) .ok_or_else(bad_resource_id)?; render_bundle_ids.push(render_bundle_resource.0); } let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -295,21 +295,21 @@ pub fn op_webgpu_render_pass_end_pass( ) -> Result<Value, AnyError> { let command_encoder_resource = state .resource_table - .get::<super::command_encoder::WebGPUCommandEncoder>( + .get::<super::command_encoder::WebGpuCommandEncoder>( args.command_encoder_rid, ) .ok_or_else(bad_resource_id)?; let command_encoder = command_encoder_resource.0; let render_pass_resource = state .resource_table - .take::<WebGPURenderPass>(args.render_pass_rid) + .take::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; let render_pass = &render_pass_resource.0.borrow(); let instance = state.borrow::<super::Instance>(); 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(json!({ "err": maybe_err.map(WebGpuError::from) })) } #[derive(Deserialize)] @@ -330,11 +330,11 @@ pub fn op_webgpu_render_pass_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; // I know this might look like it can be easily deduplicated, but it can not @@ -385,7 +385,7 @@ pub fn op_webgpu_render_pass_push_debug_group( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -413,7 +413,7 @@ pub fn op_webgpu_render_pass_pop_debug_group( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_pop_debug_group( @@ -437,7 +437,7 @@ pub fn op_webgpu_render_pass_insert_debug_marker( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; unsafe { @@ -466,11 +466,11 @@ pub fn op_webgpu_render_pass_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_pipeline( @@ -498,11 +498,11 @@ pub fn op_webgpu_render_pass_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; render_pass_resource.0.borrow_mut().set_index_buffer( @@ -532,11 +532,11 @@ pub fn op_webgpu_render_pass_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_set_vertex_buffer( @@ -567,7 +567,7 @@ pub fn op_webgpu_render_pass_draw( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_draw( @@ -599,7 +599,7 @@ pub fn op_webgpu_render_pass_draw_indexed( ) -> Result<Value, AnyError> { let render_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_draw_indexed( @@ -629,11 +629,11 @@ pub fn op_webgpu_render_pass_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_draw_indirect( @@ -660,11 +660,11 @@ pub fn op_webgpu_render_pass_draw_indexed_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_pass_resource = state .resource_table - .get::<WebGPURenderPass>(args.render_pass_rid) + .get::<WebGpuRenderPass>(args.render_pass_rid) .ok_or_else(bad_resource_id)?; wgpu_core::command::render_ffi::wgpu_render_pass_draw_indexed_indirect( diff --git a/op_crates/webgpu/sampler.rs b/op_crates/webgpu/sampler.rs index 74d46e896..fdff70b77 100644 --- a/op_crates/webgpu/sampler.rs +++ b/op_crates/webgpu/sampler.rs @@ -10,10 +10,10 @@ use deno_core::{OpState, Resource}; use serde::Deserialize; use std::borrow::Cow; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUSampler(pub(crate) wgpu_core::id::SamplerId); -impl Resource for WebGPUSampler { +pub(crate) struct WebGpuSampler(pub(crate) wgpu_core::id::SamplerId); +impl Resource for WebGpuSampler { fn name(&self) -> Cow<str> { "webGPUSampler".into() } @@ -87,7 +87,7 @@ pub fn op_webgpu_create_sampler( let instance = state.borrow::<super::Instance>(); 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; @@ -121,10 +121,10 @@ pub fn op_webgpu_create_sampler( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUSampler(sampler)); + let rid = state.resource_table.add(WebGpuSampler(sampler)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } diff --git a/op_crates/webgpu/shader.rs b/op_crates/webgpu/shader.rs index 28ad4ef62..8a0613862 100644 --- a/op_crates/webgpu/shader.rs +++ b/op_crates/webgpu/shader.rs @@ -10,10 +10,10 @@ use deno_core::{OpState, Resource}; use serde::Deserialize; use std::borrow::Cow; -use super::error::WebGPUError; +use super::error::WebGpuError; -pub(crate) struct WebGPUShaderModule(pub(crate) wgpu_core::id::ShaderModuleId); -impl Resource for WebGPUShaderModule { +pub(crate) struct WebGpuShaderModule(pub(crate) wgpu_core::id::ShaderModuleId); +impl Resource for WebGpuShaderModule { fn name(&self) -> Cow<str> { "webGPUShaderModule".into() } @@ -36,7 +36,7 @@ pub fn op_webgpu_create_shader_module( let instance = state.borrow::<super::Instance>(); 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; @@ -69,10 +69,10 @@ pub fn op_webgpu_create_shader_module( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUShaderModule(shader_module)); + let rid = state.resource_table.add(WebGpuShaderModule(shader_module)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } diff --git a/op_crates/webgpu/texture.rs b/op_crates/webgpu/texture.rs index 8a5d48bd9..2dcff5027 100644 --- a/op_crates/webgpu/texture.rs +++ b/op_crates/webgpu/texture.rs @@ -10,16 +10,16 @@ use deno_core::{OpState, Resource}; use serde::Deserialize; use std::borrow::Cow; -use super::error::WebGPUError; -pub(crate) struct WebGPUTexture(pub(crate) wgpu_core::id::TextureId); -impl Resource for WebGPUTexture { +use super::error::WebGpuError; +pub(crate) struct WebGpuTexture(pub(crate) wgpu_core::id::TextureId); +impl Resource for WebGpuTexture { fn name(&self) -> Cow<str> { "webGPUTexture".into() } } -pub(crate) struct WebGPUTextureView(pub(crate) wgpu_core::id::TextureViewId); -impl Resource for WebGPUTextureView { +pub(crate) struct WebGpuTextureView(pub(crate) wgpu_core::id::TextureViewId); +impl Resource for WebGpuTextureView { fn name(&self) -> Cow<str> { "webGPUTextureView".into() } @@ -125,7 +125,7 @@ pub fn serialize_dimension( #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct GPUExtent3D { +pub struct GpuExtent3D { pub width: Option<u32>, pub height: Option<u32>, pub depth: Option<u32>, @@ -136,7 +136,7 @@ pub struct GPUExtent3D { pub struct CreateTextureArgs { device_rid: ResourceId, label: Option<String>, - size: GPUExtent3D, + size: GpuExtent3D, mip_level_count: Option<u32>, sample_count: Option<u32>, dimension: Option<String>, @@ -152,7 +152,7 @@ pub fn op_webgpu_create_texture( let instance = state.borrow::<super::Instance>(); 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; @@ -184,11 +184,11 @@ pub fn op_webgpu_create_texture( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUTexture(texture)); + let rid = state.resource_table.add(WebGpuTexture(texture)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -214,7 +214,7 @@ pub fn op_webgpu_create_texture_view( let instance = state.borrow::<super::Instance>(); let texture_resource = state .resource_table - .get::<WebGPUTexture>(args.texture_rid) + .get::<WebGpuTexture>(args.texture_rid) .ok_or_else(bad_resource_id)?; let texture = texture_resource.0; @@ -248,10 +248,10 @@ pub fn op_webgpu_create_texture_view( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUTextureView(texture_view)); + let rid = state.resource_table.add(WebGpuTextureView(texture_view)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } |