Move bevy_render::renderer::diagnostics to bevy_render::diagnostics

bevyengine · Jul 21, 2023 · 5c2d9ce · 5c2d9ce
1 parent 90830ee
commit 5c2d9ce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/...s/bevy_render/src/renderer/diagnostics.rs → crates/bevy_render/src/diagnostics.rs b/...s/bevy_render/src/renderer/diagnostics.rs → crates/bevy_render/src/diagnostics.rs
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
@@ -7,6 +7,7 @@ extern crate core;
 
 pub mod camera;
 pub mod color;
+pub mod diagnostics;
 pub mod extract_component;
 mod extract_param;
 pub mod extract_resource;

diff --git a/crates/bevy_render/src/render_phase/draw_state.rs b/crates/bevy_render/src/render_phase/draw_state.rs
@@ -1,14 +1,12 @@
 use crate::{
  camera::Viewport,
+ diagnostics::{Pass, PassKind, WritePipelineStatistics, WriteTimestamp},
  prelude::Color,
  render_resource::{
  BindGroup, BindGroupId, Buffer, BufferId, BufferSlice, RenderPipeline, RenderPipelineId,
  ShaderStages,
  },
- renderer::{
- diagnostics::{Pass, PassKind, WritePipelineStatistics, WriteTimestamp},
- RenderDevice,
- },
+ renderer::RenderDevice,
 };
 use bevy_utils::{default, detailed_trace};
 use std::ops::Range;

diff --git a/crates/bevy_render/src/renderer/graph_runner.rs b/crates/bevy_render/src/renderer/graph_runner.rs
@@ -9,15 +9,14 @@ use std::{borrow::Cow, collections::VecDeque};
 use thiserror::Error;
 
 use crate::{
+ diagnostics::{DiagnosticsRecorder, RenderDiagnosticsMutex},
  render_graph::{
  Edge, NodeId, NodeRunError, NodeState, RenderGraph, RenderGraphContext, SlotLabel,
  SlotType, SlotValue,
  },
  renderer::{RenderContext, RenderDevice},
 };
 
-use super::diagnostics::{DiagnosticsRecorder, RenderDiagnosticsMutex};
-
 pub(crate) struct RenderGraphRunner;
 
 #[derive(Error, Debug)]

diff --git a/crates/bevy_render/src/renderer/mod.rs b/crates/bevy_render/src/renderer/mod.rs
@@ -1,4 +1,3 @@
-pub mod diagnostics;
 mod graph_runner;
 mod render_device;
 
@@ -8,6 +7,7 @@ pub use graph_runner::*;
 pub use render_device::*;
 
 use crate::{
+ diagnostics::{DiagnosticsRecorder, OptionalDiagnosticRecorder},
  render_graph::RenderGraph,
  render_phase::TrackedRenderPass,
  render_resource::RenderPassDescriptor,
@@ -22,8 +22,6 @@ use wgpu::{
  Adapter, AdapterInfo, CommandBuffer, CommandEncoder, Instance, Queue, RequestAdapterOptions,
 };
 
-use self::diagnostics::{DiagnosticsRecorder, OptionalDiagnosticRecorder};
-
 /// Updates the [`RenderGraph`] with all of its nodes and then runs it to render the entire frame.
 pub fn render_system(world: &mut World) {
  world.resource_scope(|world, mut graph: Mut<RenderGraph>| {