wgpu-hal dynamic dispatch, towards fewer generics in wgpu-core

deno_webgpu/binding.rs

@@ -21,7 +21,7 @@ impl Resource for WebGpuBindGroupLayout {
     }
 
     fn close(self: Rc<Self>) {
-        gfx_select!(self.1 => self.0.bind_group_layout_drop(self.1));
+        self.0.bind_group_layout_drop(self.1);
     }
 }
 
@@ -35,7 +35,7 @@ impl Resource for WebGpuBindGroup {
     }
 
     fn close(self: Rc<Self>) {
-        gfx_select!(self.1 => self.0.bind_group_drop(self.1));
+        self.0.bind_group_drop(self.1);
     }
 }
 
@@ -191,7 +191,7 @@ pub fn op_webgpu_create_bind_group_layout(
         entries: Cow::from(entries),
     };
 
-    gfx_put!(device => instance.device_create_bind_group_layout(
+    gfx_put!(instance.device_create_bind_group_layout(
     device,
     &descriptor,
     None
@@ -226,7 +226,7 @@ pub fn op_webgpu_create_pipeline_layout(
         push_constant_ranges: Default::default(),
     };
 
-    gfx_put!(device => instance.device_create_pipeline_layout(
+    gfx_put!(instance.device_create_pipeline_layout(
     device,
     &descriptor,
     None
@@ -305,7 +305,7 @@ pub fn op_webgpu_create_bind_group(
         entries: Cow::from(entries),
     };
 
-    gfx_put!(device => instance.device_create_bind_group(
+    gfx_put!(instance.device_create_bind_group(
     device,
     &descriptor,
     None

deno_webgpu/buffer.rs

@@ -27,7 +27,7 @@ impl Resource for WebGpuBuffer {
     }
 
     fn close(self: Rc<Self>) {
-        gfx_select!(self.1 => self.0.buffer_drop(self.1));
+        self.0.buffer_drop(self.1);
     }
 }
 
@@ -62,7 +62,7 @@ pub fn op_webgpu_create_buffer(
         mapped_at_creation,
     };
 
-    gfx_put!(device => instance.device_create_buffer(
+    gfx_put!(instance.device_create_buffer(
     device,
     &descriptor,
     None
@@ -97,20 +97,21 @@ pub async fn op_webgpu_buffer_get_map_async(
         });
 
         // TODO(lucacasonato): error handling
-        let maybe_err = gfx_select!(buffer => instance.buffer_map_async(
-            buffer,
-            offset,
-            Some(size),
-            wgpu_core::resource::BufferMapOperation {
-                host: match mode {
-                    1 => wgpu_core::device::HostMap::Read,
-                    2 => wgpu_core::device::HostMap::Write,
-                    _ => unreachable!(),
+        let maybe_err = instance
+            .buffer_map_async(
+                buffer,
+                offset,
+                Some(size),
+                wgpu_core::resource::BufferMapOperation {
+                    host: match mode {
+                        1 => wgpu_core::device::HostMap::Read,
+                        2 => wgpu_core::device::HostMap::Write,
+                        _ => unreachable!(),
+                    },
+                    callback: Some(wgpu_core::resource::BufferMapCallback::from_rust(callback)),
                 },
-                callback: Some(wgpu_core::resource::BufferMapCallback::from_rust(callback)),
-            }
-        ))
-        .err();
+            )
+            .err();
 
         if maybe_err.is_some() {
             return Ok(WebGpuResult::maybe_err(maybe_err));
@@ -124,7 +125,8 @@ pub async fn op_webgpu_buffer_get_map_async(
             {
                 let state = state.borrow();
                 let instance = state.borrow::<super::Instance>();
-                gfx_select!(device => instance.device_poll(device, wgpu_types::Maintain::wait()))
+                instance
+                    .device_poll(device, wgpu_types::Maintain::wait())
                     .unwrap();
             }
             tokio::time::sleep(Duration::from_millis(10)).await;
@@ -157,12 +159,9 @@ pub fn op_webgpu_buffer_get_mapped_range(
     let buffer_resource = state.resource_table.get::<WebGpuBuffer>(buffer_rid)?;
     let buffer = buffer_resource.1;
 
-    let (slice_pointer, range_size) = gfx_select!(buffer => instance.buffer_get_mapped_range(
-      buffer,
-      offset,
-      size
-    ))
-    .map_err(|e| DomExceptionOperationError::new(&e.to_string()))?;
+    let (slice_pointer, range_size) = instance
+        .buffer_get_mapped_range(buffer, offset, size)
+        .map_err(|e| DomExceptionOperationError::new(&e.to_string()))?;
 
     // SAFETY: guarantee to be safe from wgpu
     let slice =
@@ -199,5 +198,5 @@ pub fn op_webgpu_buffer_unmap(
         slice.copy_from_slice(buf);
     }
 
-    gfx_ok!(buffer => instance.buffer_unmap(buffer))
+    gfx_ok!(instance.buffer_unmap(buffer))
 }

deno_webgpu/bundle.rs

@@ -30,7 +30,7 @@ impl Resource for WebGpuRenderBundle {
     }
 
     fn close(self: Rc<Self>) {
-        gfx_select!(self.1 => self.0.render_bundle_drop(self.1));
+        self.0.render_bundle_drop(self.1);
     }
 }
 
@@ -108,7 +108,7 @@ pub fn op_webgpu_render_bundle_encoder_finish(
         .into_inner();
     let instance = state.borrow::<super::Instance>();
 
-    gfx_put!(render_bundle_encoder.parent() => instance.render_bundle_encoder_finish(
+    gfx_put!(instance.render_bundle_encoder_finish(
     render_bundle_encoder,
     &wgpu_core::command::RenderBundleDescriptor {
       label: Some(label),

deno_webgpu/command_encoder.rs

@@ -23,7 +23,7 @@ impl Resource for WebGpuCommandEncoder {
     }
 
     fn close(self: Rc<Self>) {
-        gfx_select!(self.1 => self.0.command_encoder_drop(self.1));
+        self.0.command_encoder_drop(self.1);
     }
 }
 
@@ -38,7 +38,7 @@ impl Resource for WebGpuCommandBuffer {
 
     fn close(self: Rc<Self>) {
         if let Some(id) = *self.1.borrow() {
-            gfx_select!(id => self.0.command_buffer_drop(id));
+            self.0.command_buffer_drop(id);
         }
     }
 }
@@ -58,7 +58,7 @@ pub fn op_webgpu_create_command_encoder(
 
     let descriptor = wgpu_types::CommandEncoderDescriptor { label: Some(label) };
 
-    gfx_put!(device => instance.device_create_command_encoder(
+    gfx_put!(instance.device_create_command_encoder(
     device,
     &descriptor,
     None
@@ -210,7 +210,8 @@ pub fn op_webgpu_command_encoder_begin_render_pass(
         occlusion_query_set: occlusion_query_set_resource,
     };
 
-    let (render_pass, error) = gfx_select!(command_encoder => instance.command_encoder_create_render_pass_dyn(*command_encoder, &descriptor));
+    let (render_pass, error) =
+        instance.command_encoder_create_render_pass(*command_encoder, &descriptor);
     let rid = state
         .resource_table
         .add(super::render_pass::WebGpuRenderPass(RefCell::new(
@@ -262,7 +263,8 @@ pub fn op_webgpu_command_encoder_begin_compute_pass(
         timestamp_writes: timestamp_writes.as_ref(),
     };
 
-    let (compute_pass, error) = gfx_select!(command_encoder => instance.command_encoder_create_compute_pass_dyn(*command_encoder, &descriptor));
+    let (compute_pass, error) =
+        instance.command_encoder_create_compute_pass(*command_encoder, &descriptor);
     let rid = state
         .resource_table
         .add(super::compute_pass::WebGpuComputePass(RefCell::new(
@@ -297,13 +299,13 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_buffer(
         .get::<super::buffer::WebGpuBuffer>(destination)?;
     let destination_buffer = destination_buffer_resource.1;
 
-    gfx_ok!(command_encoder => instance.command_encoder_copy_buffer_to_buffer(
-      command_encoder,
-      source_buffer,
-      source_offset,
-      destination_buffer,
-      destination_offset,
-      size
+    gfx_ok!(instance.command_encoder_copy_buffer_to_buffer(
+        command_encoder,
+        source_buffer,
+        source_offset,
+        destination_buffer,
+        destination_offset,
+        size
     ))
 }
 
@@ -360,11 +362,11 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_texture(
         origin: destination.origin,
         aspect: destination.aspect,
     };
-    gfx_ok!(command_encoder => instance.command_encoder_copy_buffer_to_texture(
-      command_encoder,
-      &source,
-      &destination,
-      &copy_size
+    gfx_ok!(instance.command_encoder_copy_buffer_to_texture(
+        command_encoder,
+        &source,
+        &destination,
+        &copy_size
     ))
 }
 
@@ -403,11 +405,11 @@ pub fn op_webgpu_command_encoder_copy_texture_to_buffer(
             rows_per_image: destination.rows_per_image,
         },
     };
-    gfx_ok!(command_encoder => instance.command_encoder_copy_texture_to_buffer(
-      command_encoder,
-      &source,
-      &destination,
-      &copy_size
+    gfx_ok!(instance.command_encoder_copy_texture_to_buffer(
+        command_encoder,
+        &source,
+        &destination,
+        &copy_size
     ))
 }
 
@@ -444,11 +446,11 @@ pub fn op_webgpu_command_encoder_copy_texture_to_texture(
         origin: destination.origin,
         aspect: destination.aspect,
     };
-    gfx_ok!(command_encoder => instance.command_encoder_copy_texture_to_texture(
-      command_encoder,
-      &source,
-      &destination,
-      &copy_size
+    gfx_ok!(instance.command_encoder_copy_texture_to_texture(
+        command_encoder,
+        &source,
+        &destination,
+        &copy_size
     ))
 }
 
@@ -470,11 +472,11 @@ pub fn op_webgpu_command_encoder_clear_buffer(
         .resource_table
         .get::<super::buffer::WebGpuBuffer>(buffer_rid)?;
 
-    gfx_ok!(command_encoder => instance.command_encoder_clear_buffer(
-      command_encoder,
-      destination_resource.1,
-      offset,
-      Some(size)
+    gfx_ok!(instance.command_encoder_clear_buffer(
+        command_encoder,
+        destination_resource.1,
+        offset,
+        Some(size)
     ))
 }
 
@@ -491,7 +493,7 @@ pub fn op_webgpu_command_encoder_push_debug_group(
         .get::<WebGpuCommandEncoder>(command_encoder_rid)?;
     let command_encoder = command_encoder_resource.1;
 
-    gfx_ok!(command_encoder => instance.command_encoder_push_debug_group(command_encoder, group_label))
+    gfx_ok!(instance.command_encoder_push_debug_group(command_encoder, group_label))
 }
 
 #[op2]
@@ -506,7 +508,7 @@ pub fn op_webgpu_command_encoder_pop_debug_group(
         .get::<WebGpuCommandEncoder>(command_encoder_rid)?;
     let command_encoder = command_encoder_resource.1;
 
-    gfx_ok!(command_encoder => instance.command_encoder_pop_debug_group(command_encoder))
+    gfx_ok!(instance.command_encoder_pop_debug_group(command_encoder))
 }
 
 #[op2]
@@ -522,10 +524,7 @@ pub fn op_webgpu_command_encoder_insert_debug_marker(
         .get::<WebGpuCommandEncoder>(command_encoder_rid)?;
     let command_encoder = command_encoder_resource.1;
 
-    gfx_ok!(command_encoder => instance.command_encoder_insert_debug_marker(
-      command_encoder,
-      marker_label
-    ))
+    gfx_ok!(instance.command_encoder_insert_debug_marker(command_encoder, marker_label))
 }
 
 #[op2]
@@ -545,10 +544,10 @@ pub fn op_webgpu_command_encoder_write_timestamp(
         .resource_table
         .get::<super::WebGpuQuerySet>(query_set)?;
 
-    gfx_ok!(command_encoder => instance.command_encoder_write_timestamp(
-      command_encoder,
-      query_set_resource.1,
-      query_index
+    gfx_ok!(instance.command_encoder_write_timestamp(
+        command_encoder,
+        query_set_resource.1,
+        query_index
     ))
 }
 
@@ -575,13 +574,13 @@ pub fn op_webgpu_command_encoder_resolve_query_set(
         .resource_table
         .get::<super::buffer::WebGpuBuffer>(destination)?;
 
-    gfx_ok!(command_encoder => instance.command_encoder_resolve_query_set(
-      command_encoder,
-      query_set_resource.1,
-      first_query,
-      query_count,
-      destination_resource.1,
-      destination_offset
+    gfx_ok!(instance.command_encoder_resolve_query_set(
+        command_encoder,
+        query_set_resource.1,
+        first_query,
+        query_count,
+        destination_resource.1,
+        destination_offset
     ))
 }
 
@@ -600,10 +599,7 @@ pub fn op_webgpu_command_encoder_finish(
 
     let descriptor = wgpu_types::CommandBufferDescriptor { label: Some(label) };
 
-    let (val, maybe_err) = gfx_select!(command_encoder => instance.command_encoder_finish(
-      command_encoder,
-      &descriptor
-    ));
+    let (val, maybe_err) = instance.command_encoder_finish(command_encoder, &descriptor);
 
     let rid = state.resource_table.add(WebGpuCommandBuffer(
         instance.clone(),