Rename commands to trace_commands

Author: andyleiserson

wgpu-core/src/command/clear.rs

@@ -120,7 +120,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), ClearError> {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::ClearBuffer { dst, offset, size });
             }
 
@@ -205,7 +205,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), ClearError> {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::ClearTexture {
                     dst,
                     subresource_range: *subresource_range,

wgpu-core/src/command/compute.rs

@@ -437,7 +437,7 @@ impl Global {
             let mut cmd_buf_data = cmd_enc.data.lock();
             let cmd_buf_data = cmd_buf_data.get_inner();
 
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(crate::command::Command::RunComputePass {
                     base: BasePass {
                         label: base.label.clone(),

wgpu-core/src/command/mod.rs

@@ -656,7 +656,7 @@ pub struct CommandBufferMutable {
     debug_scope_depth: u32,
 
     #[cfg(feature = "trace")]
-    pub(crate) commands: Option<Vec<TraceCommand>>,
+    pub(crate) trace_commands: Option<Vec<TraceCommand>>,
 }
 
 impl CommandBufferMutable {
@@ -729,7 +729,7 @@ impl CommandEncoder {
                         crate::indirect_validation::DrawResources::new(device.clone()),
                     debug_scope_depth: 0,
                     #[cfg(feature = "trace")]
-                    commands: if device.trace.lock().is_some() {
+                    trace_commands: if device.trace.lock().is_some() {
                         Some(Vec::new())
                     } else {
                         None
@@ -1225,7 +1225,7 @@ impl Global {
             cmd_buf_data.debug_scope_depth += 1;
 
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::PushDebugGroup(label.to_owned()));
             }
 
@@ -1260,7 +1260,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), CommandEncoderError> {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::InsertDebugMarker(label.to_owned()));
             }
 
@@ -1299,7 +1299,7 @@ impl Global {
             cmd_buf_data.debug_scope_depth -= 1;
 
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::PopDebugGroup);
             }
 

wgpu-core/src/command/query.rs

@@ -367,7 +367,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), QueryError> {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::WriteTimestamp {
                     query_set_id,
                     query_index,
@@ -408,7 +408,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), QueryError> {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::ResolveQuerySet {
                     query_set_id,
                     start_query,

wgpu-core/src/command/ray_tracing.rs

@@ -200,7 +200,7 @@ impl Global {
         let mut cmd_buf_data = cmd_enc.data.lock();
         cmd_buf_data.record_with(|cmd_buf_data| {
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(crate::command::Command::BuildAccelerationStructures {
                     blas: trace_blas.clone(),
                     tlas: trace_tlas.clone(),

wgpu-core/src/command/render.rs

@@ -1752,7 +1752,7 @@ impl Global {
             let mut cmd_buf_data = cmd_enc.data.lock();
             let cmd_buf_data = cmd_buf_data.get_inner();
 
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(crate::command::Command::RunRenderPass {
                     base: BasePass {
                         label: base.label.clone(),

wgpu-core/src/command/transfer.rs

@@ -850,7 +850,7 @@ impl Global {
             }
 
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::CopyBufferToBuffer {
                     src: source,
                     src_offset: source_offset,
@@ -1013,7 +1013,7 @@ impl Global {
             device.check_is_valid()?;
 
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::CopyBufferToTexture {
                     src: *source,
                     dst: *destination,
@@ -1166,7 +1166,7 @@ impl Global {
             device.check_is_valid()?;
 
             #[cfg(feature = "trace")]
-            if let Some(list) = cmd_buf_data.commands.as_mut() {
+            if let Some(list) = cmd_buf_data.trace_commands.as_mut() {
                 list.push(TraceCommand::CopyTextureToBuffer {
                     src: *source,
                     dst: *destination,
@@ -1333,7 +1333,7 @@ impl Global {
             let snatch_guard = device.snatchable_lock.read();
 
             #[cfg(feature = "trace")]
-            if let Some(ref mut list) = cmd_buf_data.commands {
+            if let Some(ref mut list) = cmd_buf_data.trace_commands {
                 list.push(TraceCommand::CopyTextureToTexture {
                     src: *source,
                     dst: *destination,

wgpu-core/src/device/queue.rs

@@ -1206,7 +1206,7 @@ impl Queue {
                             if let Ok(ref mut cmd_buf_data) = cmd_buf_data {
                                 trace.add(Action::Submit(
                                     submit_index,
-                                    cmd_buf_data.commands.take().unwrap(),
+                                    cmd_buf_data.trace_commands.take().unwrap(),
                                 ));
                             }
                         }