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

kms: Don't loose screencopy sessions

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-12-03 00:06:20 +01:00
parent 26f46876b4
commit 74cec7bdd6
1 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/backend/kms/mod.rs
View file

@ -7,7 +7,7 @@ use crate::{
state::{BackendData, ClientState, Common, Data, Fps}, state::{BackendData, ClientState, Common, Data, Fps},
utils::prelude::*, utils::prelude::*,
wayland::{ wayland::{
handlers::screencopy::{PendingScreencopyBuffers, UserdataExt}, handlers::screencopy::UserdataExt,
protocols::screencopy::{BufferParams, Session as ScreencopySession}, protocols::screencopy::{BufferParams, Session as ScreencopySession},
}, },
}; };
@ -445,11 +445,11 @@ impl State {
if let Some((output, avg_rendertime)) = rescheduled { if let Some((output, avg_rendertime)) = rescheduled {
let mut scheduled_sessions = let mut scheduled_sessions =
data.state.workspace_session_for_output(&output); data.state.workspace_session_for_output(&output);
if let Some(sessions) = output.user_data().get::<PendingScreencopyBuffers>() let mut output_sessions = output.pending_buffers().peekable();
{ if output_sessions.peek().is_some() {
scheduled_sessions scheduled_sessions
.get_or_insert_with(Vec::new) .get_or_insert_with(Vec::new)
.extend(sessions.borrow_mut().drain(..)); .extend(output_sessions);
} }
let repaint_delay = std::cmp::max(avg_rendertime, MIN_RENDER_TIME); let repaint_delay = std::cmp::max(avg_rendertime, MIN_RENDER_TIME);
@ -1063,6 +1063,13 @@ impl KmsState {
.find(|(_, _, s)| s.output == *output) .find(|(_, _, s)| s.output == *output)
{ {
if surface.surface.is_none() { if surface.surface.is_none() {
if let Some(sessions) = screencopy_sessions {
loop_handle.insert_idle(move |data| {
for (session, params) in sessions.into_iter() {
data.state.common.still_pending(session, params);
}
});
}
return Ok(()); return Ok(());
} }
if !surface.pending { if !surface.pending {
@ -1084,31 +1091,44 @@ impl KmsState {
let backend = data.state.backend.kms(); let backend = data.state.backend.kms();
if let Some(device) = backend.devices.get_mut(&device) { if let Some(device) = backend.devices.get_mut(&device) {
if let Some(surface) = device.surfaces.get_mut(&crtc) { if let Some(surface) = device.surfaces.get_mut(&crtc) {
if let Err(err) = surface.render_output( match surface.render_output(
&data.display.handle(), &data.display.handle(),
&mut backend.api, &mut backend.api,
&device.render_node, &device.render_node,
&mut data.state.common, &mut data.state.common,
screencopy_sessions.as_deref(), screencopy_sessions.as_deref(),
) { ) {
if let Some(sessions) = screencopy_sessions.as_mut() { Ok(_) => return TimeoutAction::Drop,
for (session, params) in sessions.drain(..) { Err(err) => {
data.state.common.still_pending(session, params); if backend.session.is_active() {
slog_scope::error!("Error rendering: {}", err);
return TimeoutAction::ToDuration(
Duration::from_secs_f64(
(1000.0 / surface.refresh_rate as f64) - 0.003,
),
);
} }
} }
if backend.session.is_active() { };
slog_scope::error!("Error rendering: {}", err); }
return TimeoutAction::ToDuration(Duration::from_secs_f64( }
(1000.0 / surface.refresh_rate as f64) - 0.003,
)); if let Some(sessions) = screencopy_sessions.as_mut() {
} for (session, params) in sessions.drain(..) {
} data.state.common.still_pending(session, params);
} }
} }
TimeoutAction::Drop TimeoutAction::Drop
}, },
)?); )?);
} else { } else {
if let Some(sessions) = screencopy_sessions {
loop_handle.insert_idle(|data| {
for (session, params) in sessions.into_iter() {
data.state.common.still_pending(session, params);
}
});
}
surface.dirty = true; surface.dirty = true;
} }
} }