Restructured everything to make profiling a feature of iced_winit.

4 files changed, 14 insertions, 14 deletions

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index dda9aee1..9ab12ce0 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -10,8 +10,8 @@ use iced_graphics::{Primitive, Viewport};
 use iced_native::alignment;
 use iced_native::{Font, Size};
 
-#[cfg(feature = "trace")]
-use iced_profiling::info_span;
+#[cfg(feature = "tracing")]
+use tracing::info_span;
 
 #[cfg(any(feature = "image", feature = "svg"))]
 use crate::image;
@@ -80,7 +80,7 @@ impl Backend {
         overlay_text: &[T],
     ) {
         log::debug!("Drawing");
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let _ = info_span!("Wgpu::Backend", "PRESENT").entered();
 
         let target_size = viewport.physical_size();
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index ed81e0c6..a5e63b17 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -23,8 +23,8 @@ use iced_native::image;
 #[cfg(feature = "svg")]
 use iced_native::svg;
 
-#[cfg(feature = "trace")]
-use iced_profiling::info_span;
+#[cfg(feature = "tracing")]
+use tracing::info_span;
 
 #[derive(Debug)]
 pub struct Pipeline {
@@ -292,7 +292,7 @@ impl Pipeline {
         target: &wgpu::TextureView,
         _scale: f32,
     ) {
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let _ = info_span!("Wgpu::Image", "DRAW").entered();
 
         let instances: &mut Vec<Instance> = &mut Vec::new();
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 702122e1..2f5fcc6b 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -6,8 +6,8 @@ use bytemuck::{Pod, Zeroable};
 use std::mem;
 use wgpu::util::DeviceExt;
 
-#[cfg(feature = "trace")]
-use iced_profiling::info_span;
+#[cfg(feature = "tracing")]
+use tracing::info_span;
 
 #[derive(Debug)]
 pub struct Pipeline {
@@ -176,7 +176,7 @@ impl Pipeline {
         bounds: Rectangle<u32>,
         target: &wgpu::TextureView,
     ) {
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let _ = info_span!("Wgpu::Quad", "DRAW").entered();
 
         let uniforms = Uniforms::new(transformation, scale);
@@ -213,7 +213,7 @@ impl Pipeline {
 
             instance_buffer.copy_from_slice(instance_bytes);
 
-            #[cfg(feature = "trace")]
+            #[cfg(feature = "tracing")]
             let _ = info_span!("Wgpu::Quad", "BEGIN_RENDER_PASS").enter();
 
             {
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index b7c63167..efdd214b 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -8,8 +8,8 @@ use crate::Transformation;
 use iced_graphics::layer::mesh::{self, Mesh};
 use iced_graphics::triangle::ColoredVertex2D;
 use iced_graphics::Size;
-#[cfg(feature = "trace")]
-use iced_profiling::info_span;
+#[cfg(feature = "tracing")]
+use tracing::info_span;
 
 #[derive(Debug)]
 pub struct Pipeline {
@@ -55,7 +55,7 @@ impl Pipeline {
         scale_factor: f32,
         meshes: &[Mesh<'_>],
     ) {
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let _ = info_span!("Wgpu::Triangle", "DRAW").entered();
 
         // Count the total amount of vertices & indices we need to handle
@@ -252,7 +252,7 @@ impl Pipeline {
                 (target, None, wgpu::LoadOp::Load)
             };
 
-            #[cfg(feature = "trace")]
+            #[cfg(feature = "tracing")]
             let _ = info_span!("Wgpu::Triangle", "BEGIN_RENDER_PASS").enter();
 
             let mut render_pass =