diff --git a/wgpu-core-remote-types/src/encoders.rs b/wgpu-core-remote-types/src/encoders.rs index a4a5d6840..2d0a484e1 100644 --- a/wgpu-core-remote-types/src/encoders.rs +++ b/wgpu-core-remote-types/src/encoders.rs @@ -92,15 +92,23 @@ pub struct RenderPassDescriptor<'a> { pub timestamp_writes: Option, } +/// Corresponds to [`GPUComputePassDescriptor`](https://gpuweb.github.io/gpuweb/#dictdef-gpucomputepassdescriptor) +#[derive(Clone, Debug, Default, serde::Serialize, serde::Deserialize)] +pub struct ComputePassDescriptor<'a> { + pub label: Label<'a>, + /// Defines where and when timestamp values will be written for this pass. + pub timestamp_writes: Option, +} + #[derive(serde::Serialize, serde::Deserialize)] /// Corresponds to [`GPUCommandEncoder`](https://www.w3.org/TR/webgpu/#gpucommandencoder). -pub enum CommandEncoderCommand<'a, CPD> { +pub enum CommandEncoderCommand<'a> { BeginRenderPass { desc: RenderPassDescriptor<'a>, render_pass_encoder_id: id::RenderPassEncoderId, }, BeginComputePass { - desc: CPD, // optional, defaults to {} + desc: ComputePassDescriptor<'a>, // optional, defaults to {} compute_pass_encoder_id: id::ComputePassEncoderId, }, CopyBufferToBuffer { diff --git a/wgpu-core-remote/src/global/command_encoder.rs b/wgpu-core-remote/src/global/command_encoder.rs index 844553c6a..01b344172 100644 --- a/wgpu-core-remote/src/global/command_encoder.rs +++ b/wgpu-core-remote/src/global/command_encoder.rs @@ -2,7 +2,6 @@ use wgpu_core::Label; use wgpu_core_remote_types::encoders::{CommandEncoderCommand, DebugCommand}; use wgt::{BufferAddress, Extent3d, ImageSubresourceRange}; -use crate::global::compute_pass::ComputePassDescriptor; use crate::global::Global; use crate::hub::Hub; use crate::id::{BufferId, CommandEncoderId, TextureId}; @@ -213,7 +212,7 @@ impl Global { pub fn handle_command_encoder_command<'a>( &self, command_encoder_id: CommandEncoderId, - command: CommandEncoderCommand<'a, ComputePassDescriptor<'a>>, + command: CommandEncoderCommand<'a>, ) { match command { CommandEncoderCommand::BeginRenderPass { diff --git a/wgpu-core-remote/src/global/compute_pass.rs b/wgpu-core-remote/src/global/compute_pass.rs index 80b88100b..5f4389d63 100644 --- a/wgpu-core-remote/src/global/compute_pass.rs +++ b/wgpu-core-remote/src/global/compute_pass.rs @@ -1,16 +1,15 @@ use alloc::borrow::Cow; use wgpu_core::command::PassTimestampWrites; -use wgpu_core_remote_types::encoders::{BindingCommand, ComputePassEncoderCommand, DebugCommand}; +use wgpu_core_remote_types::encoders::{ + BindingCommand, ComputePassDescriptor, ComputePassEncoderCommand, DebugCommand, +}; use wgt::{BufferAddress, DynamicOffset}; use crate::global::Global; use crate::hub::Hub; use crate::id; -pub type ComputePassDescriptor<'a> = - wgpu_core::command::ComputePassDescriptor<'a, PassTimestampWrites>; - impl Global { /// Creates a compute pass. ///