Split update_render_elements() from advance_animations()

advance_animations() is called from places like input, whereas
update_render_elements() is strictly for rendering.

3 files changed, 16 insertions, 12 deletions

diff --git a/niri-visual-tests/src/cases/gradient_area.rs b/niri-visual-tests/src/cases/gradient_area.rs
index e11cf828..b6741575 100644
--- a/niri-visual-tests/src/cases/gradient_area.rs
+++ b/niri-visual-tests/src/cases/gradient_area.rs
@@ -20,7 +20,7 @@ pub struct GradientArea {
 
 impl GradientArea {
     pub fn new(_size: Size<i32, Logical>) -> Self {
-        let mut border = FocusRing::new(niri_config::FocusRing {
+        let border = FocusRing::new(niri_config::FocusRing {
             off: false,
             width: 1,
             active_color: Color::new(255, 255, 255, 128),
@@ -28,7 +28,6 @@ impl GradientArea {
             active_gradient: None,
             inactive_gradient: None,
         });
-        border.set_active(true);
 
         Self {
             progress: 0.,
@@ -86,15 +85,16 @@ impl TestCase for GradientArea {
         let mut g_area = Rectangle::from_loc_and_size(g_loc, g_size);
         g_area.loc -= area.loc;
 
-        self.border.update(g_size, true, CornerRadius::default());
+        self.border.update_render_elements(
+            g_size,
+            true,
+            true,
+            Rectangle::default(),
+            CornerRadius::default(),
+        );
         rv.extend(
             self.border
-                .render(
-                    renderer,
-                    Point::from(g_loc),
-                    Scale::from(1.),
-                    size.to_logical(1),
-                )
+                .render(renderer, Point::from(g_loc), Scale::from(1.))
                 .map(|elem| Box::new(elem) as _),
         );
 
diff --git a/niri-visual-tests/src/cases/layout.rs b/niri-visual-tests/src/cases/layout.rs
index 75a6eaae..eb2d8a9a 100644
--- a/niri-visual-tests/src/cases/layout.rs
+++ b/niri-visual-tests/src/cases/layout.rs
@@ -222,6 +222,7 @@ impl TestCase for Layout {
         renderer: &mut GlesRenderer,
         _size: Size<i32, Physical>,
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
+        self.layout.update_render_elements(&self.output);
         self.layout
             .monitor_for_output(&self.output)
             .unwrap()
diff --git a/niri-visual-tests/src/cases/tile.rs b/niri-visual-tests/src/cases/tile.rs
index 93aa38a0..301fc19f 100644
--- a/niri-visual-tests/src/cases/tile.rs
+++ b/niri-visual-tests/src/cases/tile.rs
@@ -6,7 +6,7 @@ use niri::render_helpers::RenderTarget;
 use niri_config::Color;
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Logical, Physical, Point, Scale, Size};
+use smithay::utils::{Logical, Physical, Point, Rectangle, Scale, Size};
 
 use super::TestCase;
 use crate::test_window::TestWindow;
@@ -94,7 +94,7 @@ impl TestCase for Tile {
     }
 
     fn advance_animations(&mut self, current_time: Duration) {
-        self.tile.advance_animations(current_time, true);
+        self.tile.advance_animations(current_time);
     }
 
     fn render(
@@ -105,12 +105,15 @@ impl TestCase for Tile {
         let tile_size = self.tile.tile_size().to_physical(1);
         let location = Point::from(((size.w - tile_size.w) / 2, (size.h - tile_size.h) / 2));
 
+        self.tile.update(
+            true,
+            Rectangle::from_loc_and_size((-location.x, -location.y), size.to_logical(1)),
+        );
         self.tile
             .render(
                 renderer,
                 location,
                 Scale::from(1.),
-                size.to_logical(1),
                 true,
                 RenderTarget::Output,
             )