From 21de479ab800caaf92833cb5da628aae21a00975 Mon Sep 17 00:00:00 2001 From: LeshaInc Date: Wed, 12 Jul 2023 19:05:37 +0300 Subject: [PATCH] Appease clippy --- .../bevy_render/src/renderer/graph_runner.rs | 2 +- crates/bevy_render/src/renderer/statistics.rs | 31 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/crates/bevy_render/src/renderer/graph_runner.rs b/crates/bevy_render/src/renderer/graph_runner.rs index 0d76bece58684..bc31f2c2ea220 100644 --- a/crates/bevy_render/src/renderer/graph_runner.rs +++ b/crates/bevy_render/src/renderer/graph_runner.rs @@ -72,7 +72,7 @@ impl RenderGraphRunner { } let render_statistics_mutex = world.resource::().0.clone(); - render_context.download_statistics(&queue, move |statistics| { + render_context.download_statistics(queue, move |statistics| { *render_statistics_mutex.lock() = Some(statistics); }); diff --git a/crates/bevy_render/src/renderer/statistics.rs b/crates/bevy_render/src/renderer/statistics.rs index 56732663d03ca..4cc1de5cbb2ac 100644 --- a/crates/bevy_render/src/renderer/statistics.rs +++ b/crates/bevy_render/src/renderer/statistics.rs @@ -210,21 +210,18 @@ impl StatisticsRecorder { let statistics = pass_records.into_iter().map(|(name, record)| { let mut statistics = RenderPassStatistics::default(); - statistics.elapsed_cpu = match (record.begin_instant, record.end_instant) { - (Some(begin), Some(end)) => Some(end - begin), - _ => None, - }; - - statistics.elapsed_gpu = - match (record.begin_timestamp_index, record.end_timestamp_index) { - (Some(begin), Some(end)) => { - let begin = timestamps[begin as usize] as f64; - let end = timestamps[end as usize] as f64; - let nanos = ((end - begin) * (timestamp_period as f64)).round() as u64; - Some(Duration::from_nanos(nanos)) - } - _ => None, - }; + if let (Some(begin), Some(end)) = (record.begin_instant, record.end_instant) { + statistics.elapsed_cpu = Some(end - begin); + } + + if let (Some(begin), Some(end)) = + (record.begin_timestamp_index, record.end_timestamp_index) + { + let begin = timestamps[begin as usize] as f64; + let end = timestamps[end as usize] as f64; + let nanos = ((end - begin) * (timestamp_period as f64)).round() as u64; + statistics.elapsed_gpu = Some(Duration::from_nanos(nanos)); + } if let Some(index) = record.pipeline_statistics_index { let index = (index as usize) * 5; @@ -261,7 +258,7 @@ impl MeasuredRenderPass<'_> { let mut render_pass = encoder.begin_render_pass(&desc); if let Some(name) = &name { - recorder.begin_render_pass(&mut render_pass, name) + recorder.begin_render_pass(&mut render_pass, name); } MeasuredRenderPass { @@ -279,7 +276,7 @@ impl Drop for MeasuredRenderPass<'_> { } if let Some(name) = &self.name { - self.recorder.end_render_pass(&mut self.render_pass, &name) + self.recorder.end_render_pass(&mut self.render_pass, name); } } }