diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tty.rs | 44 | ||||
| -rw-r--r-- | src/render_helpers/offscreen.rs | 11 | ||||
| -rw-r--r-- | src/render_helpers/primary_gpu_texture.rs | 10 | ||||
| -rw-r--r-- | src/render_helpers/render_elements.rs | 12 | ||||
| -rw-r--r-- | src/render_helpers/renderer.rs | 4 | ||||
| -rw-r--r-- | src/screenshot_ui.rs | 12 |
6 files changed, 35 insertions, 58 deletions
diff --git a/src/backend/tty.rs b/src/backend/tty.rs index d9c1c7f1..4b45d13e 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -10,7 +10,7 @@ use std::{io, mem}; use anyhow::{anyhow, Context}; use libc::dev_t; use niri_config::Config; -use smithay::backend::allocator::dmabuf::{Dmabuf, DmabufAllocator}; +use smithay::backend::allocator::dmabuf::Dmabuf; use smithay::backend::allocator::gbm::{GbmAllocator, GbmBufferFlags, GbmDevice}; use smithay::backend::allocator::{Format, Fourcc}; use smithay::backend::drm::compositor::{DrmCompositor, PrimaryPlaneElement}; @@ -62,7 +62,7 @@ pub struct Tty { session: LibSeatSession, udev_dispatcher: Dispatcher<'static, UdevBackend, State>, libinput: Libinput, - gpu_manager: GpuManager<GbmGlesBackend<GlesRenderer>>, + gpu_manager: GpuManager<GbmGlesBackend<GlesRenderer, DrmDeviceFd>>, // DRM node corresponding to the primary GPU. May or may not be the same as // primary_render_node. primary_node: DrmNode, @@ -73,33 +73,28 @@ pub struct Tty { // The dma-buf global corresponds to the output device (the primary GPU). It is only `Some()` // if we have a device corresponding to the primary GPU. dmabuf_global: Option<DmabufGlobal>, - // The allocator for the primary GPU. It is only `Some()` if we have a device corresponding to - // the primary GPU. - primary_allocator: Option<DmabufAllocator<GbmAllocator<DrmDeviceFd>>>, // The output config had changed, but the session is paused, so we need to update it on resume. update_output_config_on_resume: bool, ipc_outputs: Rc<RefCell<HashMap<String, niri_ipc::Output>>>, enabled_outputs: Arc<Mutex<HashMap<String, Output>>>, } -pub type TtyRenderer<'render, 'alloc> = MultiRenderer< +pub type TtyRenderer<'render> = MultiRenderer< 'render, 'render, - 'alloc, - GbmGlesBackend<GlesRenderer>, - GbmGlesBackend<GlesRenderer>, + GbmGlesBackend<GlesRenderer, DrmDeviceFd>, + GbmGlesBackend<GlesRenderer, DrmDeviceFd>, >; -pub type TtyFrame<'render, 'alloc, 'frame> = MultiFrame< +pub type TtyFrame<'render, 'frame> = MultiFrame< 'render, 'render, - 'alloc, 'frame, - GbmGlesBackend<GlesRenderer>, - GbmGlesBackend<GlesRenderer>, + GbmGlesBackend<GlesRenderer, DrmDeviceFd>, + GbmGlesBackend<GlesRenderer, DrmDeviceFd>, >; -pub type TtyRendererError<'render, 'alloc> = <TtyRenderer<'render, 'alloc> as Renderer>::Error; +pub type TtyRendererError<'render> = <TtyRenderer<'render> as Renderer>::Error; type GbmDrmCompositor = DrmCompositor< GbmAllocator<DrmDeviceFd>, @@ -276,7 +271,6 @@ impl Tty { primary_render_node, devices: HashMap::new(), dmabuf_global: None, - primary_allocator: None, update_output_config_on_resume: false, ipc_outputs: Rc::new(RefCell::new(HashMap::new())), enabled_outputs: Arc::new(Mutex::new(HashMap::new())), @@ -460,11 +454,6 @@ impl Tty { ); assert!(self.dmabuf_global.replace(dmabuf_global).is_none()); - // Create the primary allocator. - let primary_allocator = - DmabufAllocator(GbmAllocator::new(gbm.clone(), GbmBufferFlags::RENDERING)); - assert!(self.primary_allocator.replace(primary_allocator).is_none()); - // Update the dmabuf feedbacks for all surfaces. for device in self.devices.values_mut() { for surface in device.surfaces.values_mut() { @@ -600,8 +589,6 @@ impl Tty { ) .unwrap(); - self.primary_allocator = None; - // Clear the dmabuf feedbacks for all surfaces. for device in self.devices.values_mut() { for surface in device.surfaces.values_mut() { @@ -1088,15 +1075,9 @@ impl Tty { return rv; } - let Some(allocator) = self.primary_allocator.as_mut() else { - warn!("no primary allocator"); - return rv; - }; - let mut renderer = match self.gpu_manager.renderer( &self.primary_render_node, &device.render_node, - allocator, surface.compositor.format(), ) { Ok(renderer) => renderer, @@ -1208,7 +1189,10 @@ impl Tty { }; match renderer.import_dmabuf(dmabuf, None) { - Ok(_texture) => true, + Ok(_texture) => { + dmabuf.set_node(Some(self.primary_render_node)); + true + } Err(err) => { debug!("error importing dmabuf: {err:?}"); false @@ -1218,8 +1202,6 @@ impl Tty { pub fn early_import(&mut self, surface: &WlSurface) { if let Err(err) = self.gpu_manager.early_import( - // We always advertise the primary GPU in dmabuf feedback. - Some(self.primary_render_node), // We always render on the primary GPU. self.primary_render_node, surface, diff --git a/src/render_helpers/offscreen.rs b/src/render_helpers/offscreen.rs index a28c4e9a..69b0be84 100644 --- a/src/render_helpers/offscreen.rs +++ b/src/render_helpers/offscreen.rs @@ -188,14 +188,14 @@ impl RenderElement<GlesRenderer> for OffscreenRenderElement { } } -impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> for OffscreenRenderElement { +impl<'render> RenderElement<TtyRenderer<'render>> for OffscreenRenderElement { fn draw( &self, - frame: &mut TtyFrame<'_, '_, '_>, + frame: &mut TtyFrame<'_, '_>, src: Rectangle<f64, Buffer>, dst: Rectangle<i32, Physical>, damage: &[Rectangle<i32, Physical>], - ) -> Result<(), TtyRendererError<'render, 'alloc>> { + ) -> Result<(), TtyRendererError<'render>> { let gles_frame = frame.as_gles_frame(); if let Some(texture) = &self.texture { RenderElement::<GlesRenderer>::draw(texture, gles_frame, src, dst, damage)?; @@ -205,10 +205,7 @@ impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> for OffscreenR Ok(()) } - fn underlying_storage( - &self, - renderer: &mut TtyRenderer<'render, 'alloc>, - ) -> Option<UnderlyingStorage> { + fn underlying_storage(&self, renderer: &mut TtyRenderer<'render>) -> Option<UnderlyingStorage> { if let Some(texture) = &self.texture { texture.underlying_storage(renderer) } else { diff --git a/src/render_helpers/primary_gpu_texture.rs b/src/render_helpers/primary_gpu_texture.rs index a3835c49..5ec50a6e 100644 --- a/src/render_helpers/primary_gpu_texture.rs +++ b/src/render_helpers/primary_gpu_texture.rs @@ -73,16 +73,14 @@ impl RenderElement<GlesRenderer> for PrimaryGpuTextureRenderElement { } } -impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> - for PrimaryGpuTextureRenderElement -{ +impl<'render> RenderElement<TtyRenderer<'render>> for PrimaryGpuTextureRenderElement { fn draw( &self, - frame: &mut TtyFrame<'_, '_, '_>, + frame: &mut TtyFrame<'_, '_>, src: Rectangle<f64, Buffer>, dst: Rectangle<i32, Physical>, damage: &[Rectangle<i32, Physical>], - ) -> Result<(), TtyRendererError<'render, 'alloc>> { + ) -> Result<(), TtyRendererError<'render>> { let gles_frame = frame.as_gles_frame(); RenderElement::<GlesRenderer>::draw(&self.0, gles_frame, src, dst, damage)?; Ok(()) @@ -90,7 +88,7 @@ impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> fn underlying_storage( &self, - _renderer: &mut TtyRenderer<'render, 'alloc>, + _renderer: &mut TtyRenderer<'render>, ) -> Option<UnderlyingStorage> { // If scanout for things other than Wayland buffers is implemented, this will need to take // the target GPU into account. diff --git a/src/render_helpers/render_elements.rs b/src/render_helpers/render_elements.rs index d6423bff..1f100536 100644 --- a/src/render_helpers/render_elements.rs +++ b/src/render_helpers/render_elements.rs @@ -90,26 +90,26 @@ macro_rules! niri_render_elements { } } - impl<'render, 'alloc> smithay::backend::renderer::element::RenderElement<$crate::backend::tty::TtyRenderer<'render, 'alloc>> - for $name<$crate::backend::tty::TtyRenderer<'render, 'alloc>> + impl<'render> smithay::backend::renderer::element::RenderElement<$crate::backend::tty::TtyRenderer<'render>> + for $name<$crate::backend::tty::TtyRenderer<'render>> { fn draw( &self, - frame: &mut $crate::backend::tty::TtyFrame<'render, 'alloc, '_>, + frame: &mut $crate::backend::tty::TtyFrame<'render, '_>, src: smithay::utils::Rectangle<f64, smithay::utils::Buffer>, dst: smithay::utils::Rectangle<i32, smithay::utils::Physical>, damage: &[smithay::utils::Rectangle<i32, smithay::utils::Physical>], - ) -> Result<(), $crate::backend::tty::TtyRendererError<'render, 'alloc>> { + ) -> Result<(), $crate::backend::tty::TtyRendererError<'render>> { match self { $($name::$variant(elem) => { - smithay::backend::renderer::element::RenderElement::<$crate::backend::tty::TtyRenderer<'render, 'alloc>>::draw(elem, frame, src, dst, damage) + smithay::backend::renderer::element::RenderElement::<$crate::backend::tty::TtyRenderer<'render>>::draw(elem, frame, src, dst, damage) })+ } } fn underlying_storage( &self, - renderer: &mut $crate::backend::tty::TtyRenderer<'render, 'alloc>, + renderer: &mut $crate::backend::tty::TtyRenderer<'render>, ) -> Option<smithay::backend::renderer::element::UnderlyingStorage> { match self { $($name::$variant(elem) => elem.underlying_storage(renderer)),+ diff --git a/src/render_helpers/renderer.rs b/src/render_helpers/renderer.rs index 7f85b66d..5c483182 100644 --- a/src/render_helpers/renderer.rs +++ b/src/render_helpers/renderer.rs @@ -46,7 +46,7 @@ impl AsGlesRenderer for GlesRenderer { } } -impl<'render, 'alloc> AsGlesRenderer for TtyRenderer<'render, 'alloc> { +impl<'render> AsGlesRenderer for TtyRenderer<'render> { fn as_gles_renderer(&mut self) -> &mut GlesRenderer { self.as_mut() } @@ -66,7 +66,7 @@ impl<'frame> AsGlesFrame<'frame> for GlesFrame<'frame> { } } -impl<'render, 'alloc, 'frame> AsGlesFrame<'frame> for TtyFrame<'render, 'alloc, 'frame> { +impl<'render, 'frame> AsGlesFrame<'frame> for TtyFrame<'render, 'frame> { fn as_gles_frame(&mut self) -> &mut GlesFrame<'frame> { self.as_mut() } diff --git a/src/screenshot_ui.rs b/src/screenshot_ui.rs index 311b357b..b632e3bf 100644 --- a/src/screenshot_ui.rs +++ b/src/screenshot_ui.rs @@ -547,27 +547,27 @@ impl RenderElement<GlesRenderer> for ScreenshotUiRenderElement { } } -impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> for ScreenshotUiRenderElement { +impl<'render> RenderElement<TtyRenderer<'render>> for ScreenshotUiRenderElement { fn draw( &self, - frame: &mut TtyFrame<'render, 'alloc, '_>, + frame: &mut TtyFrame<'render, '_>, src: Rectangle<f64, Buffer>, dst: Rectangle<i32, Physical>, damage: &[Rectangle<i32, Physical>], - ) -> Result<(), TtyRendererError<'render, 'alloc>> { + ) -> Result<(), TtyRendererError<'render>> { match self { Self::Screenshot(elem) => { - RenderElement::<TtyRenderer<'render, 'alloc>>::draw(&elem, frame, src, dst, damage) + RenderElement::<TtyRenderer<'render>>::draw(&elem, frame, src, dst, damage) } Self::SolidColor(elem) => { - RenderElement::<TtyRenderer<'render, 'alloc>>::draw(&elem, frame, src, dst, damage) + RenderElement::<TtyRenderer<'render>>::draw(&elem, frame, src, dst, damage) } } } fn underlying_storage( &self, - _renderer: &mut TtyRenderer<'render, 'alloc>, + _renderer: &mut TtyRenderer<'render>, ) -> Option<UnderlyingStorage> { // If scanout for things other than Wayland buffers is implemented, this will need to take // the target GPU into account. |