monolith

public

Star0

Fork 0

Watch0

283 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `1136328fbe69`

tarball

atagen <boss@atagen.co>2026-10-19 10:44 UTC

1 file changed+55-34

drm: move adaptive sync and frame timing out of render_surface

render_surface carried about 175 lines, including two blocks that only touch Surface. They are now Surface::set_vrr and Surface::record_frame.

Modified file: crates/monolith/src/drm/render.rs+55 additions−34 deletions@@ -1,5 +1,6 @@
 //! Drawing one output and queueing the frame.
 
+use super::Surface;
 use super::pacing::{schedule, watch};
 use crate::backend::Backend;
 use crate::frame::{CLEAR, FrameCtx};
@@ -42,6 +43,51 @@ pub fn render(state: &mut State) {
     }
 }
 
+struct FrameTimes {
+    took_ns: u64,
+    scene_ns: u64,
+    render_ns: u64,
+    render_cpu_ns: u64,
+    queue_ns: u64,
+    frame_cpu_ns: u64,
+}
+
+impl Surface {
+    fn set_vrr(&mut self, want: bool) {
+        if want == self.vrr_on {
+            return;
+        }
+        match self.drm.with_compositor(|c| c.use_vrr(want)) {
+            Ok(()) => {
+                self.vrr_on = want;
+                tracing::info!(output = self.output.name(), vrr = want, "adaptive sync");
+            }
+            Err(e) => {
+                tracing::warn!("could not switch adaptive sync: {e}");
+                self.vrr_capable = false;
+            }
+        }
+    }
+
+    fn record_frame(&mut self, t: FrameTimes) {
+        self.budget.record(t.took_ns);
+        if self.frame_cpu_ns.len() < MAX_CPU_SAMPLES {
+            self.frame_cpu_ns.push(t.frame_cpu_ns);
+        }
+        if t.took_ns > self.refresh_ns / 2 {
+            tracing::debug!(
+                output = self.output.name(),
+                took_ns = t.took_ns,
+                scene_ns = t.scene_ns,
+                render_ns = t.render_ns,
+                render_cpu_ns = t.render_cpu_ns,
+                queue_ns = t.queue_ns,
+                "slow frame"
+            );
+        }
+    }
+}
+
 /// Draws one output for the vblank at `target`. Returns whether it still
 /// animates without a frame in flight, and so needs another render.
 #[profiling::function]
@@ -84,22 +130,7 @@ pub(super) fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64)
             Vrr::On => true,
             Vrr::Fullscreen => fullscreen.is_some(),
         });
-    if want_vrr != surface.vrr_on {
-        match surface.drm.with_compositor(|c| c.use_vrr(want_vrr)) {
-            Ok(()) => {
-                surface.vrr_on = want_vrr;
-                tracing::info!(
-                    output = surface.output.name(),
-                    vrr = want_vrr,
-                    "adaptive sync"
-                );
-            }
-            Err(e) => {
-                tracing::warn!("could not switch adaptive sync: {e}");
-                surface.vrr_capable = false;
-            }
-        }
-    }
+    surface.set_vrr(want_vrr);
     let began = std::time::Instant::now();
     let frame_cpu_began = thread_cpu_ns();
     let now = target;
@@ -182,24 +213,14 @@ pub(super) fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64)
             tracing::warn!("rendering failed: {e}");
         }
     }
-    let render_cpu_ns = thread_cpu_ns() - cpu_began;
-    let render_ns = render_began.elapsed().as_nanos() as u64 - queue_ns;
-    let took = began.elapsed().as_nanos() as u64;
-    surface.budget.record(took);
-    if surface.frame_cpu_ns.len() < MAX_CPU_SAMPLES {
-        surface.frame_cpu_ns.push(thread_cpu_ns() - frame_cpu_began);
-    }
-    if took > surface.refresh_ns / 2 {
-        tracing::debug!(
-            output = surface.output.name(),
-            took_ns = took,
-            scene_ns,
-            render_ns,
-            render_cpu_ns,
-            queue_ns,
-            "slow frame"
-        );
-    }
+    surface.record_frame(FrameTimes {
+        took_ns: began.elapsed().as_nanos() as u64,
+        scene_ns,
+        render_ns: render_began.elapsed().as_nanos() as u64 - queue_ns,
+        render_cpu_ns: thread_cpu_ns() - cpu_began,
+        queue_ns,
+        frame_cpu_ns: thread_cpu_ns() - frame_cpu_began,
+    });
     if !surface.queued {
         surface.target_ns = None;
     }

monolith

Commit 1136328fbe69

Commit `1136328fbe69`