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

chore: Update smithay

Browse source
This commit is contained in:
Victoria Brekenfeld 2026-01-22 16:10:57 +01:00 • committed by Ian Douglas Scott
parent ce5ac893a4
commit 53e0db28ac
10 changed files with 378 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/backend/render/clipped_surface.rs
View file

@ -3,15 +3,19 @@
use std::borrow::{Borrow, BorrowMut};
use cgmath::{Matrix3, Vector2};
use smithay::backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, Kind, RenderElement, UnderlyingStorage, surface::WaylandSurfaceRenderElement,
},
gles::{GlesFrame, GlesRenderer, GlesTexProgram, Uniform, UniformValue},
utils::{CommitCounter, DamageSet, OpaqueRegions},
};
use smithay::utils::{Buffer, Logical, Physical, Point, Rectangle, Scale, Size, Transform};
use smithay::{
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, Kind, RenderElement, UnderlyingStorage,
surface::WaylandSurfaceRenderElement,
},
gles::{GlesFrame, GlesRenderer, GlesTexProgram, Uniform, UniformValue},
utils::{CommitCounter, DamageSet, OpaqueRegions},
},
utils::user_data::UserDataMap,
};
use crate::backend::render::element::AsGlowRenderer;
@ -253,10 +257,12 @@ where
dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> {
BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame))
.override_default_tex_program(self.program.clone(), self.uniforms.clone());
self.inner.draw(frame, src, dst, damage, opaque_regions)?;
self.inner
.draw(frame, src, dst, damage, opaque_regions, cache)?;
BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame))
.clear_tex_program_override();
Ok(())

68
src/backend/render/element.rs
View file

@ -18,7 +18,9 @@ use smithay::{
utils::{CommitCounter, DamageSet, OpaqueRegions},
},
},
utils::{Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale},
utils::{
Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale, user_data::UserDataMap,
},
};
use super::{GlMultiRenderer, cursor::CursorRenderElement};
@ -182,6 +184,19 @@ where
CosmicElement::Egui(elem) => elem.kind(),
}
}
fn is_framebuffer_effect(&self) -> bool {
match self {
CosmicElement::Workspace(elem) => elem.is_framebuffer_effect(),
CosmicElement::Cursor(elem) => elem.is_framebuffer_effect(),
CosmicElement::Dnd(elem) => elem.is_framebuffer_effect(),
CosmicElement::MoveGrab(elem) => elem.is_framebuffer_effect(),
CosmicElement::Postprocess(elem) => elem.is_framebuffer_effect(),
CosmicElement::Zoom(elem) => elem.is_framebuffer_effect(),
#[cfg(feature = "debug")]
CosmicElement::Egui(elem) => elem.is_framebuffer_effect(),
}
}
}
impl<R> RenderElement<R> for CosmicElement<R>
@ -198,12 +213,19 @@ where
dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> {
match self {
CosmicElement::Workspace(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
CosmicElement::Cursor(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
CosmicElement::Dnd(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
CosmicElement::MoveGrab(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
CosmicElement::Workspace(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
CosmicElement::Cursor(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
CosmicElement::Dnd(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache),
CosmicElement::MoveGrab(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
CosmicElement::Postprocess(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::draw(
@ -213,10 +235,11 @@ where
dst,
damage,
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache),
#[cfg(feature = "debug")]
CosmicElement::Egui(elem) => {
let glow_frame = R::glow_frame_mut(frame);
@ -227,6 +250,7 @@ where
dst,
damage,
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
@ -251,6 +275,37 @@ where
}
}
}
fn capture_framebuffer(
&self,
frame: &mut <R>::Frame<'_, '_>,
src: Rectangle<f64, BufferCoords>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), <R>::Error> {
match self {
CosmicElement::Workspace(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Cursor(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Dnd(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::MoveGrab(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Postprocess(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicElement::Zoom(elem) => elem.capture_framebuffer(frame, src, dst, cache),
#[cfg(feature = "debug")]
CosmicElement::Egui(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
}
}
}
}
impl<R> From<CropRenderElement<RescaleRenderElement<WorkspaceRenderElement<R>>>>
@ -398,6 +453,7 @@ impl<R: Renderer> RenderElement<R> for DamageElement {
_dst: Rectangle<i32, Physical>,
_damage: &[Rectangle<i32, Physical>],
_opaque_regions: &[Rectangle<i32, Physical>],
_cache: Option<&UserDataMap>,
) -> Result<(), R::Error> {
Ok(())
}