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

chore: smithay update

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-07-02 13:15:19 +02:00
parent 553c49b42b
commit 2d0f1cbf2b
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -4856,7 +4856,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "smithay"
version = "0.3.0"
source = "git+https://github.com/smithay//smithay?rev=a1650f8#a1650f8568ad8bf0fd7844e98f4724d769cd3c75"
source = "git+https://github.com/smithay//smithay?rev=3731734#3731734d5a0409186a0475238ffe46e2835cee6d"
dependencies = [
"appendlist",
"ash 0.38.0+1.3.281",

2
Cargo.toml
View file

@ -119,4 +119,4 @@ inherits = "release"
lto = "fat"
[patch."https://github.com/Smithay/smithay.git"]
smithay = {git = "https://github.com/smithay//smithay", rev = "a1650f8"}
smithay = {git = "https://github.com/smithay//smithay", rev = "3731734"}

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

@ -402,8 +402,7 @@ impl Surface {
) -> Result<()> {
let (tx, rx) = std::sync::mpsc::sync_channel(1);
self.plane_formats = surface
.planes()
.primary
.plane_info()
.formats
.iter()
.copied()

21
src/wayland/handlers/drm_lease.rs
View file

@ -46,9 +46,24 @@ impl DrmLeaseHandler for State {
.drm
.planes(crtc)
.map_err(LeaseRejected::with_cause)?;
builder.add_plane(planes.primary.handle);
if let Some(cursor) = planes.cursor {
builder.add_plane(cursor.handle);
let (primary_plane, primary_plane_claim) = planes
.primary
.iter()
.find_map(|plane| {
backend
.drm
.claim_plane(plane.handle, *crtc)
.map(|claim| (plane, claim))
})
.ok_or_else(LeaseRejected::default)?;
builder.add_plane(primary_plane.handle, primary_plane_claim);
if let Some((cursor, claim)) = planes.cursor.and_then(|plane| {
backend
.drm
.claim_plane(plane.handle, *crtc)
.map(|claim| (plane, claim))
}) {
builder.add_plane(cursor.handle, claim);
}
} else {
tracing::warn!(