zenithsiz/zsw
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zsw.git synced 2026-02-03 09:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Each shader render function now returns it's own metrics type.

Browse Source
This commit is contained in:
Filipe Rodrigues 2025-09-17 19:17:05 +01:00
parent dba540ee87
commit 84ff5bf4df
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zsw/src/metrics.rs
View File

@ -159,6 +159,7 @@ pub struct RenderPanelFrameTime {
/// Render panel geometry frame time.
#[derive(Clone, Debug)]
#[derive(derive_more::From)]
pub enum RenderPanelGeometryFrameTime {
None(RenderPanelGeometryNoneFrameTime),
Fade(RenderPanelGeometryFadeFrameTime),

27
zsw/src/panel/renderer.rs
View File

@ -396,9 +396,9 @@ impl PanelsRenderer {
.none(wgpu, &shared.none.geometry_uniforms_bind_group_layout)
.await,
panel_state,
),
PanelState::Fade(panel_state) =>
Self::render_panel_fade_geometry(
)
.into(),
PanelState::Fade(panel_state) => Self::render_panel_fade_geometry(
wgpu,
shared,
display_geometry,
@ -407,7 +407,8 @@ impl PanelsRenderer {
&mut geometry_uniforms.fade,
panel_state,
)
.await,
.await
.into(),
PanelState::Slide(panel_state) => Self::render_panel_slide_geometry(
wgpu,
render_pass,
@ -416,7 +417,8 @@ impl PanelsRenderer {
.slide(wgpu, &shared.slide.geometry_uniforms_bind_group_layout)
.await,
panel_state,
),
)
.into(),
}
}
@ -427,7 +429,7 @@ impl PanelsRenderer {
pos_matrix: uniform::Matrix4x4,
geometry_uniforms: &PanelGeometryNoneUniforms,
panel_state: &PanelNoneState,
) -> metrics::RenderPanelGeometryFrameTime {
) -> metrics::RenderPanelGeometryNoneFrameTime {
#[time(write_uniforms)]
let () = Self::write_uniforms(wgpu, &geometry_uniforms.buffer, uniform::None {
pos_matrix,
@ -440,7 +442,7 @@ impl PanelsRenderer {
#[time(draw)]
render_pass.draw_indexed(0..6, 0, 0..1);
metrics::RenderPanelGeometryFrameTime::None(metrics::RenderPanelGeometryNoneFrameTime { write_uniforms, draw })
metrics::RenderPanelGeometryNoneFrameTime { write_uniforms, draw }
}
async fn render_panel_fade_geometry(
@ -451,7 +453,7 @@ impl PanelsRenderer {
pos_matrix: uniform::Matrix4x4,
geometry_uniforms: &mut PanelGeometryFadeUniforms,
panel_state: &PanelFadeState,
) -> metrics::RenderPanelGeometryFrameTime {
) -> metrics::RenderPanelGeometryFadeFrameTime {
let p = panel_state.progress_norm();
let f = panel_state.fade_duration_norm();
@ -545,7 +547,7 @@ impl PanelsRenderer {
});
}
metrics::RenderPanelGeometryFrameTime::Fade(metrics::RenderPanelGeometryFadeFrameTime { images: image_metrics })
metrics::RenderPanelGeometryFadeFrameTime { images: image_metrics }
}
/// Renders a panel slide's geometry
@ -555,7 +557,7 @@ impl PanelsRenderer {
pos_matrix: uniform::Matrix4x4,
geometry_uniforms: &PanelGeometrySlideUniforms,
_panel_state: &PanelSlideState,
) -> metrics::RenderPanelGeometryFrameTime {
) -> metrics::RenderPanelGeometrySlideFrameTime {
#[time(write_uniforms)]
let () = Self::write_uniforms(wgpu, &geometry_uniforms.buffer, uniform::Slide { pos_matrix });
@ -565,10 +567,7 @@ impl PanelsRenderer {
#[time(draw)]
render_pass.draw_indexed(0..6, 0, 0..1);
metrics::RenderPanelGeometryFrameTime::Slide(metrics::RenderPanelGeometrySlideFrameTime {
write_uniforms,
draw,
})
metrics::RenderPanelGeometrySlideFrameTime { write_uniforms, draw }
}
/// Writes `uniforms` into `buffer`.