chore: Update smithay
This commit is contained in:
Victoria Brekenfeld
Victoria Brekenfeld
parent
e5263bbad8
commit
f12f4db0e1
5 changed files with 45 additions and 33 deletions
|
|
@ -27,7 +27,9 @@ use smithay::{
|
|||
Fourcc,
|
||||
},
|
||||
drm::{
|
||||
compositor::{BlitFrameResultError, DrmCompositor, FrameError, PrimaryPlaneElement},
|
||||
compositor::{
|
||||
BlitFrameResultError, DrmCompositor, FrameError, FrameFlags, PrimaryPlaneElement,
|
||||
},
|
||||
DrmDeviceFd, DrmEventMetadata, DrmEventTime, DrmNode, DrmSurface, VrrSupport,
|
||||
},
|
||||
egl::EGLContext,
|
||||
|
|
@ -127,6 +129,7 @@ pub struct SurfaceThreadState {
|
|||
target_node: DrmNode,
|
||||
active: Arc<AtomicBool>,
|
||||
vrr_mode: AdaptiveSync,
|
||||
frame_flags: FrameFlags,
|
||||
compositor: Option<GbmDrmCompositor>,
|
||||
|
||||
state: QueueState,
|
||||
|
|
@ -533,6 +536,7 @@ fn surface_thread(
|
|||
target_node,
|
||||
active,
|
||||
compositor: None,
|
||||
frame_flags: FrameFlags::DEFAULT,
|
||||
vrr_mode: AdaptiveSync::Disabled,
|
||||
|
||||
state: QueueState::Idle,
|
||||
|
|
@ -706,7 +710,7 @@ impl SurfaceThreadState {
|
|||
GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT,
|
||||
),
|
||||
gbm.clone(),
|
||||
&[
|
||||
[
|
||||
Fourcc::Abgr2101010,
|
||||
Fourcc::Argb2101010,
|
||||
Fourcc::Abgr8888,
|
||||
|
|
@ -716,9 +720,9 @@ impl SurfaceThreadState {
|
|||
cursor_size,
|
||||
Some(gbm),
|
||||
) {
|
||||
Ok(mut compositor) => {
|
||||
Ok(compositor) => {
|
||||
if crate::utils::env::bool_var("COSMIC_DISABLE_DIRECT_SCANOUT").unwrap_or(false) {
|
||||
compositor.use_direct_scanout(false);
|
||||
self.frame_flags.remove(FrameFlags::ALLOW_SCANOUT);
|
||||
}
|
||||
self.active.store(true, Ordering::SeqCst);
|
||||
self.compositor = Some(compositor);
|
||||
|
|
@ -1171,7 +1175,12 @@ impl SurfaceThreadState {
|
|||
if let Err(err) = compositor.use_vrr(false) {
|
||||
warn!("Unable to set adaptive VRR state: {}", err);
|
||||
}
|
||||
compositor.render_frame(&mut renderer, &elements, [0.0, 0.0, 0.0, 1.0])
|
||||
compositor.render_frame(
|
||||
&mut renderer,
|
||||
&elements,
|
||||
[0.0, 0.0, 0.0, 1.0],
|
||||
FrameFlags::DEFAULT,
|
||||
)
|
||||
} else {
|
||||
if let Err(err) = compositor.use_vrr(vrr) {
|
||||
warn!("Unable to set adaptive VRR state: {}", err);
|
||||
|
|
@ -1180,6 +1189,7 @@ impl SurfaceThreadState {
|
|||
&mut renderer,
|
||||
&elements,
|
||||
CLEAR_COLOR, // TODO use a theme neutral color
|
||||
FrameFlags::DEFAULT,
|
||||
)
|
||||
};
|
||||
self.timings.draw_done(&self.clock);
|
||||
|
|
@ -1234,10 +1244,10 @@ impl SurfaceThreadState {
|
|||
if let Ok(dmabuf) = get_dmabuf(&buffer) {
|
||||
renderer
|
||||
.bind(dmabuf.clone())
|
||||
.map_err(RenderError::<GlMultiRenderer>::Rendering)?;
|
||||
.map_err(RenderError::<<GlMultiRenderer as Renderer>::Error>::Rendering)?;
|
||||
} else {
|
||||
let size = buffer_dimensions(&buffer).ok_or(RenderError::<
|
||||
GlMultiRenderer,
|
||||
<GlMultiRenderer as Renderer>::Error,
|
||||
>::Rendering(
|
||||
MultiError::ImportFailed,
|
||||
))?;
|
||||
|
|
@ -1251,10 +1261,10 @@ impl SurfaceThreadState {
|
|||
format,
|
||||
size,
|
||||
)
|
||||
.map_err(RenderError::<GlMultiRenderer>::Rendering)?;
|
||||
.map_err(RenderError::<<GlMultiRenderer as Renderer>::Error>::Rendering)?;
|
||||
renderer
|
||||
.bind(render_buffer)
|
||||
.map_err(RenderError::<GlMultiRenderer>::Rendering)?;
|
||||
.map_err(RenderError::<<GlMultiRenderer as Renderer>::Error>::Rendering)?;
|
||||
}
|
||||
|
||||
let (output_size, output_scale, output_transform) = (
|
||||
|
|
@ -1296,14 +1306,16 @@ impl SurfaceThreadState {
|
|||
filter,
|
||||
)
|
||||
.map_err(|err| match err {
|
||||
BlitFrameResultError::Rendering(err) => {
|
||||
RenderError::<GlMultiRenderer>::Rendering(err)
|
||||
}
|
||||
BlitFrameResultError::Export(_) => {
|
||||
RenderError::<GlMultiRenderer>::Rendering(
|
||||
MultiError::DeviceMissing,
|
||||
)
|
||||
}
|
||||
BlitFrameResultError::Rendering(err) => RenderError::<
|
||||
<GlMultiRenderer as Renderer>::Error,
|
||||
>::Rendering(
|
||||
err
|
||||
),
|
||||
BlitFrameResultError::Export(_) => RenderError::<
|
||||
<GlMultiRenderer as Renderer>::Error,
|
||||
>::Rendering(
|
||||
MultiError::DeviceMissing,
|
||||
),
|
||||
}) {
|
||||
Ok(new_sync) => {
|
||||
sync = new_sync;
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ pub fn workspace_elements<R>(
|
|||
cursor_mode: CursorMode,
|
||||
element_filter: ElementFilter,
|
||||
_fps: Option<(&EguiState, &Timings)>,
|
||||
) -> Result<Vec<CosmicElement<R>>, RenderError<R>>
|
||||
) -> Result<Vec<CosmicElement<R>>, RenderError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
|
||||
<R as Renderer>::TextureId: Send + Clone + 'static,
|
||||
|
|
@ -867,7 +867,7 @@ pub fn render_output<'d, R, Target, OffTarget>(
|
|||
now: Time<Monotonic>,
|
||||
output: &Output,
|
||||
cursor_mode: CursorMode,
|
||||
) -> Result<RenderOutputResult<'d>, RenderError<R>>
|
||||
) -> Result<RenderOutputResult<'d>, RenderError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer
|
||||
+ ImportAll
|
||||
|
|
@ -1026,7 +1026,7 @@ pub fn render_workspace<'d, R, Target, OffTarget>(
|
|||
current: (WorkspaceHandle, usize),
|
||||
cursor_mode: CursorMode,
|
||||
element_filter: ElementFilter,
|
||||
) -> Result<(RenderOutputResult<'d>, Vec<CosmicElement<R>>), RenderError<R>>
|
||||
) -> Result<(RenderOutputResult<'d>, Vec<CosmicElement<R>>), RenderError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer
|
||||
+ ImportAll
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ pub fn render_session<F, R>(
|
|||
frame: Frame,
|
||||
transform: Transform,
|
||||
render_fn: F,
|
||||
) -> Result<Option<(Frame, Vec<Rectangle<i32, BufferCoords>>)>, DTError<R>>
|
||||
) -> Result<Option<(Frame, Vec<Rectangle<i32, BufferCoords>>)>, DTError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: ExportMem,
|
||||
<R as Renderer>::Error: FromGlesError,
|
||||
|
|
@ -150,7 +150,7 @@ where
|
|||
&'d mut OutputDamageTracker,
|
||||
usize,
|
||||
Vec<Rectangle<i32, BufferCoords>>,
|
||||
) -> Result<RenderOutputResult<'d>, DTError<R>>,
|
||||
) -> Result<RenderOutputResult<'d>, DTError<<R as Renderer>::Error>>,
|
||||
{
|
||||
let mut session_damage_tracking = session.lock().unwrap();
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ pub fn render_workspace_to_buffer(
|
|||
common: &mut Common,
|
||||
output: &Output,
|
||||
handle: (WorkspaceHandle, usize),
|
||||
) -> Result<RenderOutputResult<'d>, DTError<R>>
|
||||
) -> Result<RenderOutputResult<'d>, DTError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer
|
||||
+ ImportAll
|
||||
|
|
@ -464,7 +464,7 @@ pub fn render_window_to_buffer(
|
|||
common: &mut Common,
|
||||
window: &CosmicSurface,
|
||||
geometry: Rectangle<i32, Logical>,
|
||||
) -> Result<RenderOutputResult<'d>, DTError<R>>
|
||||
) -> Result<RenderOutputResult<'d>, DTError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer
|
||||
+ ImportAll
|
||||
|
|
@ -700,7 +700,7 @@ pub fn render_cursor_to_buffer(
|
|||
additional_damage: Vec<Rectangle<i32, BufferCoords>>,
|
||||
common: &mut Common,
|
||||
seat: &Seat<State>,
|
||||
) -> Result<RenderOutputResult<'d>, DTError<R>>
|
||||
) -> Result<RenderOutputResult<'d>, DTError<<R as Renderer>::Error>>
|
||||
where
|
||||
R: Renderer
|
||||
+ ImportAll
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue