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

winit: Comment out egl binding

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-08-15 15:16:22 +04:00
parent 6ba4d01fdd
commit 70003477b1
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/winit.rs
+13 -10
View File
@@ -2,7 +2,6 @@ use std::time::Duration;
use smithay::backend::renderer::damage::OutputDamageTracker; use smithay::backend::renderer::damage::OutputDamageTracker;
use smithay::backend::renderer::gles::GlesRenderer; use smithay::backend::renderer::gles::GlesRenderer;
use smithay::backend::renderer::ImportEgl;
use smithay::backend::winit::{self, WinitError, WinitEvent, WinitEventLoop, WinitGraphicsBackend}; use smithay::backend::winit::{self, WinitError, WinitEvent, WinitEventLoop, WinitGraphicsBackend};
use smithay::output::{Mode, Output, PhysicalProperties, Subpixel}; use smithay::output::{Mode, Output, PhysicalProperties, Subpixel};
use smithay::reexports::calloop::timer::{TimeoutAction, Timer}; use smithay::reexports::calloop::timer::{TimeoutAction, Timer};
@@ -41,10 +40,10 @@ impl Backend for Winit {
let _span = tracy_client::span!("Winit::render"); let _span = tracy_client::span!("Winit::render");
self.backend.bind().unwrap(); self.backend.bind().unwrap();
// Pass age 0 as the damage is artifacting for some reason. let age = self.backend.buffer_age().unwrap();
let result = self let result = self
.damage_tracker .damage_tracker
.render_output(self.backend.renderer(), 0, elements, [0.1, 0.1, 0.1, 1.0]) .render_output(self.backend.renderer(), age, elements, [0.1, 0.1, 0.1, 1.0])
.unwrap(); .unwrap();
if let Some(damage) = result.damage { if let Some(damage) = result.damage {
self.backend.submit(Some(&damage)).unwrap(); self.backend.submit(Some(&damage)).unwrap();
@@ -103,13 +102,17 @@ impl Winit {
} }
pub fn init(&mut self, niri: &mut Niri) { pub fn init(&mut self, niri: &mut Niri) {
if let Err(err) = self // For some reason, binding the display here causes damage tracker artifacts.
.backend //
.renderer() // use smithay::backend::renderer::ImportEgl;
.bind_wl_display(&niri.display_handle) //
{ // if let Err(err) = self
warn!("error binding renderer wl_display: {err}"); // .backend
} // .renderer()
// .bind_wl_display(&niri.display_handle)
// {
// warn!("error binding renderer wl_display: {err}");
// }
niri.add_output(self.output.clone(), None); niri.add_output(self.output.clone(), None);
} }