andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

tty: Improve reselience to rendering errors

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-08-09 14:20:59 +04:00
parent c50e22d415
commit 7527cad200
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tty.rs
+33 -20
View File
@@ -33,6 +33,7 @@ use smithay_drm_extras::edid::EdidInfo;
use crate::backend::Backend;
use crate::{LoopData, Niri};
const BACKGROUND_COLOR: [f32; 4] = [0.1, 0.1, 0.1, 1.];
const SUPPORTED_COLOR_FORMATS: &[Fourcc] = &[Fourcc::Argb8888, Fourcc::Abgr8888];
pub struct Tty {
@@ -68,28 +69,40 @@ impl Backend for Tty {
elements: &[SpaceRenderElements<GlesRenderer, WaylandSurfaceRenderElement<GlesRenderer>>],
) {
let output_device = self.output_device.as_mut().unwrap();
let res = output_device
.drm_compositor
.render_frame::<_, _, GlesRenderbuffer>(
&mut output_device.gles,
elements,
[0.1, 0.1, 0.1, 1.],
let drm_compositor = &mut output_device.drm_compositor;
match drm_compositor.render_frame::<_, _, GlesRenderbuffer>(
&mut output_device.gles,
elements,
BACKGROUND_COLOR,
) {
Ok(res) => {
assert!(!res.needs_sync());
if res.damage.is_some() {
match output_device.drm_compositor.queue_frame(()) {
Ok(()) => return,
Err(err) => {
error!("error queueing frame: {err}");
}
}
}
}
Err(err) => {
// Can fail if we switched to a different TTY.
error!("error rendering frame: {err}");
}
}
// FIXME: render on demand instead of busy looping.
niri.event_loop
.insert_source(
Timer::from_duration(Duration::from_millis(6)),
|_, _, data| {
data.niri.redraw(data.tty.as_mut().unwrap());
TimeoutAction::Drop
},
)
.unwrap();
assert!(!res.needs_sync());
if res.damage.is_some() {
output_device.drm_compositor.queue_frame(()).unwrap();
} else {
niri.event_loop
.insert_source(
Timer::from_duration(Duration::from_millis(6)),
|_, _, data| {
data.niri.redraw(data.tty.as_mut().unwrap());
TimeoutAction::Drop
},
)
.unwrap();
}
}
}