From b62a07956a112e4f34ebf51ddf83f2066398905c Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Mon, 5 Feb 2024 13:07:14 +0400 Subject: Add niri_render_elements! {} We will be using this in several other places. --- src/niri.rs | 247 +++----------------------------------------------- src/render_helpers.rs | 127 ++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 232 deletions(-) (limited to 'src') diff --git a/src/niri.rs b/src/niri.rs index e880ffa8..8113d920 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -20,14 +20,11 @@ use smithay::backend::renderer::element::surface::{ }; use smithay::backend::renderer::element::utils::{select_dmabuf_feedback, RelocateRenderElement}; use smithay::backend::renderer::element::{ - default_primary_scanout_output_compare, AsRenderElements, Element, Id, Kind, RenderElement, - RenderElementStates, UnderlyingStorage, -}; -use smithay::backend::renderer::gles::{ - GlesError, GlesFrame, GlesMapping, GlesRenderer, GlesTexture, + default_primary_scanout_output_compare, AsRenderElements, Element, Kind, RenderElement, + RenderElementStates, }; +use smithay::backend::renderer::gles::{GlesMapping, GlesRenderer, GlesTexture}; use smithay::backend::renderer::sync::SyncPoint; -use smithay::backend::renderer::utils::CommitCounter; use smithay::backend::renderer::{Bind, ExportMem, Frame, Offscreen, Renderer}; use smithay::desktop::utils::{ bbox_from_surface_tree, output_update, send_dmabuf_feedback_surface_tree, @@ -57,7 +54,7 @@ use smithay::reexports::wayland_server::backend::{ use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface; use smithay::reexports::wayland_server::{Display, DisplayHandle}; use smithay::utils::{ - Buffer, ClockSource, Logical, Monotonic, Physical, Point, Rectangle, Scale, Size, Transform, + ClockSource, Logical, Monotonic, Physical, Point, Rectangle, Scale, Size, Transform, SERIAL_COUNTER, }; use smithay::wayland::compositor::{ @@ -87,8 +84,7 @@ use smithay::wayland::tablet_manager::{TabletManagerState, TabletSeatTrait}; use smithay::wayland::text_input::TextInputManagerState; use smithay::wayland::virtual_keyboard::VirtualKeyboardManagerState; -use crate::animation; -use crate::backend::tty::{SurfaceDmabufFeedback, TtyFrame, TtyRenderer, TtyRendererError}; +use crate::backend::tty::SurfaceDmabufFeedback; use crate::backend::{Backend, RenderResult, Tty, Winit}; use crate::config_error_notification::ConfigErrorNotification; use crate::cursor::{CursorManager, CursorTextureCache, RenderCursor, XCursor}; @@ -110,6 +106,7 @@ use crate::screenshot_ui::{ScreenshotUi, ScreenshotUiRenderElement}; use crate::utils::{ center, get_monotonic_time, make_screenshot_path, output_size, write_png_rgba8, }; +use crate::{animation, niri_render_elements}; const CLEAR_COLOR: [f32; 4] = [0.2, 0.2, 0.2, 1.]; const CLEAR_COLOR_LOCKED: [f32; 4] = [0.3, 0.1, 0.1, 1.]; @@ -2997,228 +2994,14 @@ fn render_to_dmabuf( Ok(()) } -// Manual RenderElement implementation due to AsGlesFrame requirement. -#[derive(Debug)] -pub enum OutputRenderElements { - Monitor(MonitorRenderElement), - Wayland(WaylandSurfaceRenderElement), - NamedPointer(MemoryRenderBufferRenderElement), - SolidColor(SolidColorRenderElement), - ScreenshotUi(ScreenshotUiRenderElement), - // Used for the CPU-rendered panels. - RelocatedMemoryBuffer(RelocateRenderElement>), -} - -impl Element for OutputRenderElements { - fn id(&self) -> &Id { - match self { - Self::Monitor(elem) => elem.id(), - Self::Wayland(elem) => elem.id(), - Self::NamedPointer(elem) => elem.id(), - Self::SolidColor(elem) => elem.id(), - Self::ScreenshotUi(elem) => elem.id(), - Self::RelocatedMemoryBuffer(elem) => elem.id(), - } - } - - fn current_commit(&self) -> CommitCounter { - match self { - Self::Monitor(elem) => elem.current_commit(), - Self::Wayland(elem) => elem.current_commit(), - Self::NamedPointer(elem) => elem.current_commit(), - Self::SolidColor(elem) => elem.current_commit(), - Self::ScreenshotUi(elem) => elem.current_commit(), - Self::RelocatedMemoryBuffer(elem) => elem.current_commit(), - } - } - - fn geometry(&self, scale: Scale) -> Rectangle { - match self { - Self::Monitor(elem) => elem.geometry(scale), - Self::Wayland(elem) => elem.geometry(scale), - Self::NamedPointer(elem) => elem.geometry(scale), - Self::SolidColor(elem) => elem.geometry(scale), - Self::ScreenshotUi(elem) => elem.geometry(scale), - Self::RelocatedMemoryBuffer(elem) => elem.geometry(scale), - } - } - - fn transform(&self) -> Transform { - match self { - Self::Monitor(elem) => elem.transform(), - Self::Wayland(elem) => elem.transform(), - Self::NamedPointer(elem) => elem.transform(), - Self::SolidColor(elem) => elem.transform(), - Self::ScreenshotUi(elem) => elem.transform(), - Self::RelocatedMemoryBuffer(elem) => elem.transform(), - } - } - - fn src(&self) -> Rectangle { - match self { - Self::Monitor(elem) => elem.src(), - Self::Wayland(elem) => elem.src(), - Self::NamedPointer(elem) => elem.src(), - Self::SolidColor(elem) => elem.src(), - Self::ScreenshotUi(elem) => elem.src(), - Self::RelocatedMemoryBuffer(elem) => elem.src(), - } - } - - fn damage_since( - &self, - scale: Scale, - commit: Option, - ) -> Vec> { - match self { - Self::Monitor(elem) => elem.damage_since(scale, commit), - Self::Wayland(elem) => elem.damage_since(scale, commit), - Self::NamedPointer(elem) => elem.damage_since(scale, commit), - Self::SolidColor(elem) => elem.damage_since(scale, commit), - Self::ScreenshotUi(elem) => elem.damage_since(scale, commit), - Self::RelocatedMemoryBuffer(elem) => elem.damage_since(scale, commit), - } - } - - fn opaque_regions(&self, scale: Scale) -> Vec> { - match self { - Self::Monitor(elem) => elem.opaque_regions(scale), - Self::Wayland(elem) => elem.opaque_regions(scale), - Self::NamedPointer(elem) => elem.opaque_regions(scale), - Self::SolidColor(elem) => elem.opaque_regions(scale), - Self::ScreenshotUi(elem) => elem.opaque_regions(scale), - Self::RelocatedMemoryBuffer(elem) => elem.opaque_regions(scale), - } - } - - fn alpha(&self) -> f32 { - match self { - Self::Monitor(elem) => elem.alpha(), - Self::Wayland(elem) => elem.alpha(), - Self::NamedPointer(elem) => elem.alpha(), - Self::SolidColor(elem) => elem.alpha(), - Self::ScreenshotUi(elem) => elem.alpha(), - Self::RelocatedMemoryBuffer(elem) => elem.alpha(), - } - } - - fn kind(&self) -> Kind { - match self { - Self::Monitor(elem) => elem.kind(), - Self::Wayland(elem) => elem.kind(), - Self::NamedPointer(elem) => elem.kind(), - Self::SolidColor(elem) => elem.kind(), - Self::ScreenshotUi(elem) => elem.kind(), - Self::RelocatedMemoryBuffer(elem) => elem.kind(), - } - } -} - -impl RenderElement for OutputRenderElements { - fn draw( - &self, - frame: &mut GlesFrame<'_>, - src: Rectangle, - dst: Rectangle, - damage: &[Rectangle], - ) -> Result<(), GlesError> { - match self { - Self::Monitor(elem) => elem.draw(frame, src, dst, damage), - Self::Wayland(elem) => elem.draw(frame, src, dst, damage), - Self::NamedPointer(elem) => { - RenderElement::::draw(&elem, frame, src, dst, damage) - } - Self::SolidColor(elem) => { - RenderElement::::draw(&elem, frame, src, dst, damage) - } - Self::ScreenshotUi(elem) => { - RenderElement::::draw(&elem, frame, src, dst, damage) - } - Self::RelocatedMemoryBuffer(elem) => elem.draw(frame, src, dst, damage), - } - } - - fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option { - match self { - Self::Monitor(elem) => elem.underlying_storage(renderer), - Self::Wayland(elem) => elem.underlying_storage(renderer), - Self::NamedPointer(elem) => elem.underlying_storage(renderer), - Self::SolidColor(elem) => elem.underlying_storage(renderer), - Self::ScreenshotUi(elem) => elem.underlying_storage(renderer), - Self::RelocatedMemoryBuffer(elem) => elem.underlying_storage(renderer), - } - } -} - -impl<'render, 'alloc> RenderElement> - for OutputRenderElements> -{ - fn draw( - &self, - frame: &mut TtyFrame<'render, 'alloc, '_>, - src: Rectangle, - dst: Rectangle, - damage: &[Rectangle], - ) -> Result<(), TtyRendererError<'render, 'alloc>> { - match self { - Self::Monitor(elem) => elem.draw(frame, src, dst, damage), - Self::Wayland(elem) => elem.draw(frame, src, dst, damage), - Self::NamedPointer(elem) => { - RenderElement::>::draw(&elem, frame, src, dst, damage) - } - Self::SolidColor(elem) => { - RenderElement::>::draw(&elem, frame, src, dst, damage) - } - Self::ScreenshotUi(elem) => { - RenderElement::>::draw(&elem, frame, src, dst, damage) - } - Self::RelocatedMemoryBuffer(elem) => elem.draw(frame, src, dst, damage), - } - } - - fn underlying_storage( - &self, - renderer: &mut TtyRenderer<'render, 'alloc>, - ) -> Option { - match self { - Self::Monitor(elem) => elem.underlying_storage(renderer), - Self::Wayland(elem) => elem.underlying_storage(renderer), - Self::NamedPointer(elem) => elem.underlying_storage(renderer), - Self::SolidColor(elem) => elem.underlying_storage(renderer), - Self::ScreenshotUi(elem) => elem.underlying_storage(renderer), - Self::RelocatedMemoryBuffer(elem) => elem.underlying_storage(renderer), - } - } -} - -impl From> for OutputRenderElements { - fn from(x: MonitorRenderElement) -> Self { - Self::Monitor(x) - } -} - -impl From> for OutputRenderElements { - fn from(x: WaylandSurfaceRenderElement) -> Self { - Self::Wayland(x) - } -} - -impl From for OutputRenderElements { - fn from(x: SolidColorRenderElement) -> Self { - Self::SolidColor(x) - } -} - -impl From for OutputRenderElements { - fn from(x: ScreenshotUiRenderElement) -> Self { - Self::ScreenshotUi(x) - } -} - -impl From>> - for OutputRenderElements -{ - fn from(x: RelocateRenderElement>) -> Self { - Self::RelocatedMemoryBuffer(x) +niri_render_elements! { + OutputRenderElements => { + Monitor = MonitorRenderElement, + Wayland = WaylandSurfaceRenderElement, + NamedPointer = MemoryRenderBufferRenderElement, + SolidColor = SolidColorRenderElement, + ScreenshotUi = ScreenshotUiRenderElement, + // Used for the CPU-rendered panels. + RelocatedMemoryBuffer = RelocateRenderElement>, } } diff --git a/src/render_helpers.rs b/src/render_helpers.rs index 5402cba7..b0ae2a72 100644 --- a/src/render_helpers.rs +++ b/src/render_helpers.rs @@ -76,6 +76,133 @@ impl<'render, 'alloc, 'frame> AsGlesFrame<'frame> for TtyFrame<'render, 'alloc, } } +// We need to implement RenderElement manually due to AsGlesFrame requirement. +// This macro does it for us. +#[macro_export] +macro_rules! niri_render_elements { + ($name:ident => { $($variant:ident = $type:ty),+ $(,)? }) => { + #[derive(Debug)] + pub enum $name { + $($variant($type)),+ + } + + impl smithay::backend::renderer::element::Element for $name { + fn id(&self) -> &smithay::backend::renderer::element::Id { + match self { + $($name::$variant(elem) => elem.id()),+ + } + } + + fn current_commit(&self) -> smithay::backend::renderer::utils::CommitCounter { + match self { + $($name::$variant(elem) => elem.current_commit()),+ + } + } + + fn geometry(&self, scale: smithay::utils::Scale) -> Rectangle { + match self { + $($name::$variant(elem) => elem.geometry(scale)),+ + } + } + + fn transform(&self) -> smithay::utils::Transform { + match self { + $($name::$variant(elem) => elem.transform()),+ + } + } + + fn src(&self) -> smithay::utils::Rectangle { + match self { + $($name::$variant(elem) => elem.src()),+ + } + } + + fn damage_since( + &self, + scale: smithay::utils::Scale, + commit: Option, + ) -> Vec> { + match self { + $($name::$variant(elem) => elem.damage_since(scale, commit)),+ + } + } + + fn opaque_regions(&self, scale: smithay::utils::Scale) -> Vec> { + match self { + $($name::$variant(elem) => elem.opaque_regions(scale)),+ + } + } + + fn alpha(&self) -> f32 { + match self { + $($name::$variant(elem) => elem.alpha()),+ + } + } + + fn kind(&self) -> smithay::backend::renderer::element::Kind { + match self { + $($name::$variant(elem) => elem.kind()),+ + } + } + } + + impl smithay::backend::renderer::element::RenderElement for $name { + fn draw( + &self, + frame: &mut smithay::backend::renderer::gles::GlesFrame<'_>, + src: smithay::utils::Rectangle, + dst: smithay::utils::Rectangle, + damage: &[smithay::utils::Rectangle], + ) -> Result<(), smithay::backend::renderer::gles::GlesError> { + match self { + $($name::$variant(elem) => { + smithay::backend::renderer::element::RenderElement::::draw(elem, frame, src, dst, damage) + })+ + } + } + + fn underlying_storage(&self, renderer: &mut smithay::backend::renderer::gles::GlesRenderer) -> Option { + match self { + $($name::$variant(elem) => elem.underlying_storage(renderer)),+ + } + } + } + + impl<'render, 'alloc> smithay::backend::renderer::element::RenderElement<$crate::backend::tty::TtyRenderer<'render, 'alloc>> + for $name<$crate::backend::tty::TtyRenderer<'render, 'alloc>> + { + fn draw( + &self, + frame: &mut $crate::backend::tty::TtyFrame<'render, 'alloc, '_>, + src: smithay::utils::Rectangle, + dst: smithay::utils::Rectangle, + damage: &[smithay::utils::Rectangle], + ) -> Result<(), $crate::backend::tty::TtyRendererError<'render, 'alloc>> { + match self { + $($name::$variant(elem) => { + smithay::backend::renderer::element::RenderElement::<$crate::backend::tty::TtyRenderer<'render, 'alloc>>::draw(elem, frame, src, dst, damage) + })+ + } + } + + fn underlying_storage( + &self, + renderer: &mut $crate::backend::tty::TtyRenderer<'render, 'alloc>, + ) -> Option { + match self { + $($name::$variant(elem) => elem.underlying_storage(renderer)),+ + } + } + } + + $(impl From<$type> for $name { + fn from(x: $type) -> Self { + Self::$variant(x) + } + })+ + }; +} + /// Wrapper for a texture from the primary GPU for rendering with the primary GPU. #[derive(Debug)] pub struct PrimaryGpuTextureRenderElement(pub TextureRenderElement); -- cgit