Skip to content

Commit d7b37cf

Browse files
ids1024Drakulix
authored andcommitted
Update smithay
Updates to use `GbmFramebufferExporter`.
1 parent 982af8f commit d7b37cf

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
124124
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
125125

126126
[patch."https://github.com/smithay/smithay"]
127-
smithay = { git = "https://github.com/smithay/smithay//", rev = "14b51bd" }
127+
smithay = { git = "https://github.com/smithay/smithay//", rev = "f85d06a" }

src/backend/kms/device.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use smithay::{
1919
},
2020
drm::{
2121
compositor::{FrameError, FrameFlags},
22+
exporter::gbm::GbmFramebufferExporter,
2223
output::DrmOutputManager,
2324
DrmDevice, DrmDeviceFd, DrmEvent, DrmNode,
2425
},
@@ -61,7 +62,7 @@ pub struct EGLInternals {
6162

6263
pub type GbmDrmOutputManager = DrmOutputManager<
6364
GbmAllocator<DrmDeviceFd>,
64-
GbmDevice<DrmDeviceFd>,
65+
GbmFramebufferExporter<DrmDeviceFd>,
6566
Option<(
6667
OutputPresentationFeedback,
6768
Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>,
@@ -221,7 +222,7 @@ impl State {
221222
gbm.clone(),
222223
GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT,
223224
),
224-
gbm.clone(),
225+
GbmFramebufferExporter::new(gbm.clone()),
225226
Some(gbm.clone()),
226227
[
227228
Fourcc::Abgr2101010,

src/backend/kms/surface/mod.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ use anyhow::{Context, Result};
2222
use calloop::channel::Channel;
2323
use smithay::{
2424
backend::{
25-
allocator::{
26-
format::FormatSet,
27-
gbm::{GbmAllocator, GbmDevice},
28-
Fourcc,
29-
},
25+
allocator::{format::FormatSet, gbm::GbmAllocator, Fourcc},
3026
drm::{
3127
compositor::{BlitFrameResultError, FrameError, FrameFlags, PrimaryPlaneElement},
28+
exporter::gbm::GbmFramebufferExporter,
3229
output::DrmOutput,
3330
DrmDeviceFd, DrmEventMetadata, DrmEventTime, DrmNode, VrrSupport,
3431
},
@@ -161,7 +158,7 @@ pub struct SurfaceThreadState {
161158

162159
pub type GbmDrmOutput = DrmOutput<
163160
GbmAllocator<DrmDeviceFd>,
164-
GbmDevice<DrmDeviceFd>,
161+
GbmFramebufferExporter<DrmDeviceFd>,
165162
Option<(
166163
OutputPresentationFeedback,
167164
Receiver<(ScreencopyFrame, Vec<Rectangle<i32, BufferCoords>>)>,

0 commit comments

Comments
 (0)