leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render: More notes for fast-copy screencopy path

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-04 17:34:17 +01:00
parent cab52fbeef
commit 9af7e1ecb2
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/backend/render/mod.rs
View file

@ -14,7 +14,9 @@ use crate::{
wayland::{ wayland::{
handlers::{data_device::get_dnd_icon, screencopy::render_to_buffer}, handlers::{data_device::get_dnd_icon, screencopy::render_to_buffer},
protocols::{ protocols::{
screencopy::{BufferParams, Session as ScreencopySession}, screencopy::{
BufferParams, CursorMode as ScreencopyCursorMode, Session as ScreencopySession,
},
workspace::WorkspaceHandle, workspace::WorkspaceHandle,
}, },
}, },
@ -26,7 +28,6 @@ use smithay::{
allocator::dmabuf::Dmabuf, allocator::dmabuf::Dmabuf,
drm::DrmNode, drm::DrmNode,
renderer::{ renderer::{
buffer_dimensions,
damage::{ damage::{
DamageTrackedRenderer, DamageTrackedRendererError as RenderError, OutputNoMode, DamageTrackedRenderer, DamageTrackedRendererError as RenderError, OutputNoMode,
}, },
@ -37,7 +38,7 @@ use smithay::{
}, },
}, },
output::Output, output::Output,
utils::{Physical, Rectangle, Transform}, utils::{Physical, Rectangle},
}; };
pub mod cursor; pub mod cursor;
@ -176,7 +177,7 @@ pub fn render_workspace<R, Target, Source>(
state: &mut Common, state: &mut Common,
output: &Output, output: &Output,
handle: &WorkspaceHandle, handle: &WorkspaceHandle,
cursor_mode: CursorMode, mut cursor_mode: CursorMode,
screencopy: Option<(Source, &[(ScreencopySession, BufferParams)])>, screencopy: Option<(Source, &[(ScreencopySession, BufferParams)])>,
#[cfg(feature = "debug")] mut fps: Option<&mut Fps>, #[cfg(feature = "debug")] mut fps: Option<&mut Fps>,
) -> Result<(Option<Vec<Rectangle<i32, Physical>>>, RenderElementStates), RenderError<R>> ) -> Result<(Option<Vec<Rectangle<i32, Physical>>>, RenderElementStates), RenderError<R>>
@ -199,6 +200,21 @@ where
let workspace = state.shell.space_for_handle(&handle).ok_or(OutputNoMode)?; let workspace = state.shell.space_for_handle(&handle).ok_or(OutputNoMode)?;
let screencopy_contains_embedded = screencopy.as_ref().map_or(false, |(_, sessions)| {
sessions
.iter()
.any(|(s, _)| s.cursor_mode() == ScreencopyCursorMode::Embedded)
});
// cursor handling without a cursor_plane in this case is horrible.
// because what if some session disagree and/or the backend wants to render with a different mode?
// It seems we would need to render to an offscreen buffer in those cases (and do multiple renders, which messes with damage tracking).
// So for now, we just pick the worst mode (embedded), if any requires it.
//
// Once we move to a cursor_plane, the default framebuffer will never contain a cursor and we can just composite the cursor for each session separately on top (or not).
if screencopy_contains_embedded {
cursor_mode = CursorMode::All;
};
let mut elements: Vec<CosmicElement<R>> = cursor_elements(renderer, state, output, cursor_mode); let mut elements: Vec<CosmicElement<R>> = cursor_elements(renderer, state, output, cursor_mode);
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
@ -255,13 +271,6 @@ where
if let Some((source, buffers)) = screencopy { if let Some((source, buffers)) = screencopy {
if res.is_ok() { if res.is_ok() {
for (session, params) in buffers { for (session, params) in buffers {
let mode = output.current_mode().unwrap().size;
let buffer_size = buffer_dimensions(&params.buffer).unwrap();
if mode.to_logical(1).to_buffer(1, Transform::Normal) != buffer_size {
session.failed(FailureReason::InvalidSize);
continue;
}
match render_to_buffer( match render_to_buffer(
gpu.cloned(), gpu.cloned(),
renderer, renderer,