From 493c8dc89072a746795d4e7b94363cfef3e0ee89 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 24 Mar 2024 09:03:59 +0400 Subject: Implement block-out-from window rule, fix alpha on window screenshots --- src/backend/tty.rs | 5 +++-- src/backend/winit.rs | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/backend') diff --git a/src/backend/tty.rs b/src/backend/tty.rs index 83315662..6e923003 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -59,7 +59,7 @@ use super::RenderResult; use crate::frame_clock::FrameClock; use crate::niri::{Niri, RedrawState, State}; use crate::render_helpers::renderer::AsGlesRenderer; -use crate::render_helpers::shaders; +use crate::render_helpers::{shaders, RenderTarget}; use crate::utils::get_monotonic_time; const SUPPORTED_COLOR_FORMATS: &[Fourcc] = &[Fourcc::Argb8888, Fourcc::Abgr8888]; @@ -1162,7 +1162,8 @@ impl Tty { }; // Render the elements. - let elements = niri.render::(&mut renderer, output, true); + let elements = + niri.render::(&mut renderer, output, true, RenderTarget::Output); // Hand them over to the DRM. let drm_compositor = &mut surface.compositor; diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 2f342b41..d23ba649 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -19,7 +19,7 @@ use smithay::reexports::winit::window::WindowBuilder; use super::RenderResult; use crate::niri::{Niri, RedrawState, State}; -use crate::render_helpers::shaders; +use crate::render_helpers::{shaders, RenderTarget}; use crate::utils::get_monotonic_time; pub struct Winit { @@ -147,7 +147,12 @@ impl Winit { let _span = tracy_client::span!("Winit::render"); // Render the elements. - let elements = niri.render::(self.backend.renderer(), output, true); + let elements = niri.render::( + self.backend.renderer(), + output, + true, + RenderTarget::Output, + ); // Hand them over to winit. self.backend.bind().unwrap(); -- cgit