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

Update smithay

Browse source 
Updates to use `GbmFramebufferExporter`.
This commit is contained in:
Ian Douglas Scott 2025-04-28 13:03:50 -07:00 • committed by Victoria Brekenfeld
parent 982af8ff10
commit d7b37cfde5
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -4735,8 +4735,8 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/smithay/smithay//?rev=14b51bd#14b51bd896fe46ba048fe6fd24136455eb36dbee" source = "git+https://github.com/smithay/smithay//?rev=f85d06a#f85d06a4629795f5008b573f6b48606db9ff6d71"
dependencies = [ dependencies = [
"aliasable", "aliasable",
"appendlist", "appendlist",

2
Cargo.toml
View file

@ -124,4 +124,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
[patch."https://github.com/smithay/smithay"] [patch."https://github.com/smithay/smithay"]
smithay = { git = "https://github.com/smithay/smithay//", rev = "14b51bd" } smithay = { git = "https://github.com/smithay/smithay//", rev = "f85d06a" }

5
src/backend/kms/device.rs
View file

@ -19,6 +19,7 @@ use smithay::{
}, },
drm::{ drm::{
compositor::{FrameError, FrameFlags}, compositor::{FrameError, FrameFlags},
exporter::gbm::GbmFramebufferExporter,
output::DrmOutputManager, output::DrmOutputManager,
DrmDevice, DrmDeviceFd, DrmEvent, DrmNode, DrmDevice, DrmDeviceFd, DrmEvent, DrmNode,
}, },
@ -61,7 +62,7 @@ pub struct EGLInternals {
pub type GbmDrmOutputManager = DrmOutputManager< pub type GbmDrmOutputManager = DrmOutputManager<
GbmAllocator<DrmDeviceFd>, GbmAllocator<DrmDeviceFd>,
GbmDevice<DrmDeviceFd>, GbmFramebufferExporter<DrmDeviceFd>,
Option<( Option<(
OutputPresentationFeedback, OutputPresentationFeedback,
Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>, Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>,
@ -221,7 +222,7 @@ impl State {
gbm.clone(), gbm.clone(),
GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT, GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT,
), ),
gbm.clone(), GbmFramebufferExporter::new(gbm.clone()),
Some(gbm.clone()), Some(gbm.clone()),
[ [
Fourcc::Abgr2101010, Fourcc::Abgr2101010,

9
src/backend/kms/surface/mod.rs
View file

@ -22,13 +22,10 @@ use anyhow::{Context, Result};
use calloop::channel::Channel; use calloop::channel::Channel;
use smithay::{ use smithay::{
backend::{ backend::{
allocator::{ allocator::{format::FormatSet, gbm::GbmAllocator, Fourcc},
format::FormatSet,
gbm::{GbmAllocator, GbmDevice},
Fourcc,
},
drm::{ drm::{
compositor::{BlitFrameResultError, FrameError, FrameFlags, PrimaryPlaneElement}, compositor::{BlitFrameResultError, FrameError, FrameFlags, PrimaryPlaneElement},
exporter::gbm::GbmFramebufferExporter,
output::DrmOutput, output::DrmOutput,
DrmDeviceFd, DrmEventMetadata, DrmEventTime, DrmNode, VrrSupport, DrmDeviceFd, DrmEventMetadata, DrmEventTime, DrmNode, VrrSupport,
}, },
@ -161,7 +158,7 @@ pub struct SurfaceThreadState {
pub type GbmDrmOutput = DrmOutput< pub type GbmDrmOutput = DrmOutput<
GbmAllocator<DrmDeviceFd>, GbmAllocator<DrmDeviceFd>,
GbmDevice<DrmDeviceFd>, GbmFramebufferExporter<DrmDeviceFd>,
Option<( Option<(
OutputPresentationFeedback, OutputPresentationFeedback,
Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>, Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>,