chore: Update smithay

This commit is contained in:
Victoria Brekenfeld 2023-07-12 18:54:53 +02:00
parent 4ee5aaf741
commit a308997fd4
17 changed files with 64 additions and 5 deletions

View file

@ -80,6 +80,7 @@ use std::{
cell::RefCell,
collections::{HashMap, HashSet},
ffi::CStr,
fmt,
os::unix::io::FromRawFd,
path::PathBuf,
time::Duration,
@ -93,6 +94,7 @@ use super::render::{init_shaders, CursorMode, GlMultiRenderer};
// for now we assume we need at least 3ms
const MIN_RENDER_TIME: Duration = Duration::from_millis(3);
#[derive(Debug)]
pub struct KmsState {
devices: HashMap<DrmNode, Device>,
pub api: GpuManager<GbmGlesBackend<GlowRenderer>>,
@ -113,6 +115,23 @@ pub struct Device {
socket: Option<Socket>,
}
impl fmt::Debug for Device {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Device")
.field("render_node", &self.render_node)
.field("surfaces", &self.surfaces)
.field("drm", &self.drm)
.field("gbm", &self.gbm)
.field("allocator", &"...")
.field("formats", &self.formats)
.field("supports_atomic", &self.supports_atomic)
.field("event_token", &self.event_token)
.field("socket", &self.socket)
.finish()
}
}
#[derive(Debug)]
pub struct Surface {
surface: Option<GbmDrmCompositor>,
connector: connector::Handle,

View file

@ -24,6 +24,7 @@ use crate::{
utils::prelude::*,
};
#[derive(Debug)]
pub struct Socket {
pub token: RegistrationToken,
pub drm_global: GlobalId,

View file

@ -38,6 +38,7 @@ use crate::state::Fps;
use super::render::{init_shaders, CursorMode};
#[derive(Debug)]
pub struct WinitState {
// The winit backend currently has no notion of multiple windows
pub backend: WinitGraphicsBackend<GlowRenderer>,

View file

@ -47,11 +47,13 @@ use crate::state::Fps;
use super::render::init_shaders;
#[derive(Debug)]
enum Allocator {
Gbm(GbmAllocator<DrmDeviceFd>),
Vulkan(PhysicalDevice),
}
#[derive(Debug)]
pub struct X11State {
allocator: Allocator,
_egl: EGLDisplay,
@ -204,6 +206,7 @@ impl X11State {
}
}
#[derive(Debug)]
pub struct Surface {
window: Window,
damage_tracker: OutputDamageTracker,