diff --git a/player/src/lib.rs b/player/src/lib.rs index 597cf11dd..1cb42e7c3 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -108,6 +108,15 @@ impl GlobalPlay for wgc::hub::Global { destination_offset, ) .unwrap(), + trace::Command::PushDebugGroup(marker) => self + .command_encoder_push_debug_group::(encoder, &marker) + .unwrap(), + trace::Command::PopDebugGroup => { + self.command_encoder_pop_debug_group::(encoder).unwrap() + } + trace::Command::InsertDebugMarker(marker) => self + .command_encoder_insert_debug_marker::(encoder, &marker) + .unwrap(), trace::Command::RunComputePass { base } => { self.command_encoder_run_compute_pass_impl::(encoder, base.as_ref()) .unwrap(); diff --git a/wgpu-core/src/command/mod.rs b/wgpu-core/src/command/mod.rs index 7c36a3301..aa45ec9ab 100644 --- a/wgpu-core/src/command/mod.rs +++ b/wgpu-core/src/command/mod.rs @@ -31,6 +31,9 @@ use crate::{ use hal::CommandEncoder as _; use thiserror::Error; +#[cfg(feature = "trace")] +use crate::device::trace::Command as TraceCommand; + const PUSH_CONSTANT_CLEAR_ARRAY: &[u32] = &[0_u32; 64]; #[derive(Debug)] @@ -100,7 +103,7 @@ pub struct CommandBuffer { limits: wgt::Limits, support_clear_buffer_texture: bool, #[cfg(feature = "trace")] - pub(crate) commands: Option>, + pub(crate) commands: Option>, } impl CommandBuffer { @@ -322,8 +325,13 @@ impl Global { let (mut cmd_buf_guard, _) = hub.command_buffers.write(&mut token); let cmd_buf = CommandBuffer::get_encoder_mut(&mut *cmd_buf_guard, encoder_id)?; - let cmd_buf_raw = cmd_buf.encoder.open(); + #[cfg(feature = "trace")] + if let Some(ref mut list) = cmd_buf.commands { + list.push(TraceCommand::PushDebugGroup(label.to_string())); + } + + let cmd_buf_raw = cmd_buf.encoder.open(); unsafe { cmd_buf_raw.begin_debug_marker(label); } @@ -342,8 +350,13 @@ impl Global { let (mut cmd_buf_guard, _) = hub.command_buffers.write(&mut token); let cmd_buf = CommandBuffer::get_encoder_mut(&mut *cmd_buf_guard, encoder_id)?; - let cmd_buf_raw = cmd_buf.encoder.open(); + #[cfg(feature = "trace")] + if let Some(ref mut list) = cmd_buf.commands { + list.push(TraceCommand::InsertDebugMarker(label.to_string())); + } + + let cmd_buf_raw = cmd_buf.encoder.open(); unsafe { cmd_buf_raw.insert_debug_marker(label); } @@ -361,8 +374,13 @@ impl Global { let (mut cmd_buf_guard, _) = hub.command_buffers.write(&mut token); let cmd_buf = CommandBuffer::get_encoder_mut(&mut *cmd_buf_guard, encoder_id)?; - let cmd_buf_raw = cmd_buf.encoder.open(); + #[cfg(feature = "trace")] + if let Some(ref mut list) = cmd_buf.commands { + list.push(TraceCommand::PopDebugGroup); + } + + let cmd_buf_raw = cmd_buf.encoder.open(); unsafe { cmd_buf_raw.end_debug_marker(); } diff --git a/wgpu-core/src/device/trace.rs b/wgpu-core/src/device/trace.rs index a74481541..3e0c79182 100644 --- a/wgpu-core/src/device/trace.rs +++ b/wgpu-core/src/device/trace.rs @@ -168,6 +168,9 @@ pub enum Command { destination: id::BufferId, destination_offset: wgt::BufferAddress, }, + PushDebugGroup(String), + PopDebugGroup, + InsertDebugMarker(String), RunComputePass { base: crate::command::BasePass, },