leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Group primitive timings in Present span

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-05-06 04:17:06 +02:00
parent e6da449c92
commit 8338435429
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 79 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

60
beacon/src/lib.rs
View file

@ -13,6 +13,7 @@ pub use span::Span;
use crate::core::theme;
use crate::core::time::{Duration, SystemTime};
use crate::error::Error;
use crate::span::present;
use futures::{SinkExt, Stream};
use tokio::io::{self, AsyncReadExt, AsyncWriteExt};
@ -128,8 +129,9 @@ pub fn run() -> impl Stream<Item = Event> {
let mut last_update_number = 0;
let mut last_tasks = 0;
let mut last_subscriptions = 0;
let mut last_present_window = None;
let mut last_present_layers = 0;
let mut last_prepare = present::Stage::default();
let mut last_render = present::Stage::default();
drop(task::spawn(async move {
let mut last_message_number = None;
@ -215,11 +217,6 @@ pub fn run() -> impl Stream<Item = Event> {
last_message.clear();
last_tasks = 0;
}
client::Event::SpanStarted(
span::Stage::Present(window),
) => {
last_present_window = Some(window);
}
client::Event::SpanStarted(_) => {}
client::Event::SpanFinished(
stage,
@ -249,35 +246,44 @@ pub fn run() -> impl Stream<Item = Event> {
span::Stage::Draw(window) => {
Span::Draw { window }
}
span::Stage::Prepare(primitive) => {
let Some(window) =
last_present_window
else {
continue;
span::Stage::Prepare(primitive)
| span::Stage::Render(primitive) => {
let stage = if matches!(
stage,
span::Stage::Prepare(_),
) {
&mut last_prepare
} else {
&mut last_render
};
Span::Prepare {
window,
primitive,
}
}
span::Stage::Render(primitive) => {
let Some(window) =
last_present_window
else {
continue;
let primitive = match primitive {
present::Primitive::Quad => &mut stage.quads,
present::Primitive::Triangle => &mut stage.triangles,
present::Primitive::Shader => &mut stage.shaders,
present::Primitive::Text => &mut stage.text,
present::Primitive::Image => &mut stage.images,
};
Span::Render {
window,
primitive,
}
*primitive += duration;
continue;
}
span::Stage::Present(window) => {
Span::Present {
let span = Span::Present {
window,
prepare: last_prepare,
render: last_render,
layers: last_present_layers,
}
};
last_prepare =
present::Stage::default();
last_render =
present::Stage::default();
last_present_layers = 0;
span
}
span::Stage::Custom(name) => {
Span::Custom { name }

86
beacon/src/span.rs
View file

@ -23,16 +23,10 @@ pub enum Span {
Draw {
window: window::Id,
},
Prepare {
window: window::Id,
primitive: Primitive,
},
Render {
window: window::Id,
primitive: Primitive,
},
Present {
window: window::Id,
prepare: present::Stage,
render: present::Stage,
layers: usize,
},
Custom {
@ -40,43 +34,6 @@ pub enum Span {
},
}
#[derive(
Debug,
Clone,
Copy,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
Deserialize,
)]
pub enum Primitive {
Quad,
Triangle,
Shader,
Text,
Image,
}
impl Span {
pub fn stage(&self) -> Stage {
match self {
Span::Boot => Stage::Boot,
Span::Update { .. } => Stage::Update,
Span::View { window } => Stage::View(*window),
Span::Layout { window } => Stage::Layout(*window),
Span::Interact { window } => Stage::Interact(*window),
Span::Draw { window } => Stage::Draw(*window),
Span::Prepare { primitive, .. } => Stage::Prepare(*primitive),
Span::Render { primitive, .. } => Stage::Render(*primitive),
Span::Present { window, .. } => Stage::Present(*window),
Span::Custom { name, .. } => Stage::Custom(name.clone()),
}
}
}
#[derive(
Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
)]
@ -88,8 +45,8 @@ pub enum Stage {
Interact(window::Id),
Draw(window::Id),
Present(window::Id),
Prepare(Primitive),
Render(Primitive),
Prepare(present::Primitive),
Render(present::Primitive),
Custom(String),
}
@ -109,3 +66,38 @@ impl std::fmt::Display for Stage {
})
}
}
pub mod present {
use crate::core::time::Duration;
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
pub struct Stage {
pub quads: Duration,
pub triangles: Duration,
pub shaders: Duration,
pub text: Duration,
pub images: Duration,
}
#[derive(
Debug,
Clone,
Copy,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
Deserialize,
)]
pub enum Primitive {
Quad,
Triangle,
Shader,
Text,
Image,
}
}