From 0eddd16b8a7d7ce6a80c695e1b05de713ffbb21a Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 6 Feb 2026 15:00:52 +0300 Subject: [PATCH] Rename Niri::render() => render_to_vec() --- src/backend/tty.rs | 2 +- src/backend/winit.rs | 2 +- src/input/pick_color_grab.rs | 2 +- src/niri.rs | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/tty.rs b/src/backend/tty.rs index edb2be61..c2aeb05f 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -1869,7 +1869,7 @@ impl Tty { renderer: &mut renderer, target: RenderTarget::Output, }; - let mut elements = niri.render(ctx, output, true); + let mut elements = niri.render_to_vec(ctx, output, true); // Visualize the damage, if enabled. if niri.debug_draw_damage { diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 42550d93..ecfb6f25 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -186,7 +186,7 @@ impl Winit { renderer: self.backend.renderer(), target: RenderTarget::Output, }; - let mut elements = niri.render(ctx, output, true); + let mut elements = niri.render_to_vec(ctx, output, true); // Visualize the damage, if enabled. if niri.debug_draw_damage { diff --git a/src/input/pick_color_grab.rs b/src/input/pick_color_grab.rs index a9252d0b..88a9bf61 100644 --- a/src/input/pick_color_grab.rs +++ b/src/input/pick_color_grab.rs @@ -54,7 +54,7 @@ impl PickColorGrab { // This is an interactive operation so we can render without blocking out. target: RenderTarget::Output, }; - let elements = data.niri.render(ctx, &output, false); + let elements = data.niri.render_to_vec(ctx, &output, false); let mapping = match render_and_download( renderer, diff --git a/src/niri.rs b/src/niri.rs index 2b3f0c3b..9586c087 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -4019,7 +4019,7 @@ impl Niri { } } - pub fn render( + pub fn render_to_vec( &self, ctx: RenderCtx, output: &Output, @@ -4923,7 +4923,7 @@ impl Niri { renderer, target: RenderTarget::ScreenCapture, }; - self.render(ctx, output, true) + self.render_to_vec(ctx, output, true) }); // FIXME: skip elements if not including pointers let render_result = Self::render_for_screencopy_internal( @@ -4990,7 +4990,7 @@ impl Niri { renderer, target: RenderTarget::ScreenCapture, }; - let elements = self.render(ctx, output, screencopy.overlay_cursor()); + let elements = self.render_to_vec(ctx, output, screencopy.overlay_cursor()); let Some(damage_tracker) = self.screencopy_state.damage_tracker(manager) else { error!("screencopy queue must not be deleted as long as frames exist"); @@ -5115,7 +5115,7 @@ impl Niri { ]; let screenshot = targets.map(|target| { let ctx = RenderCtx { renderer, target }; - let elements = self.render(ctx, &output, false); + let elements = self.render_to_vec(ctx, &output, false); let elements = elements.iter().rev(); let res = render_to_texture( @@ -5196,7 +5196,7 @@ impl Niri { renderer, target: RenderTarget::ScreenCapture, }; - let elements = self.render(ctx, output, include_pointer); + let elements = self.render_to_vec(ctx, output, include_pointer); let elements = elements.iter().rev(); let pixels = render_to_vec( renderer, @@ -5414,7 +5414,7 @@ impl Niri { renderer, target: RenderTarget::ScreenCapture, }; - let elements = self.render(ctx, &output, include_pointer); + let elements = self.render_to_vec(ctx, &output, include_pointer); let elements = elements.iter().rev(); let pixels = render_to_vec( renderer, @@ -5888,7 +5888,7 @@ impl Niri { ]; let textures = targets.map(|target| { let ctx = RenderCtx { renderer, target }; - let elements = self.render(ctx, &output, false); + let elements = self.render_to_vec(ctx, &output, false); let elements = elements.iter().rev(); let res = render_to_texture(