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

render: Merge FromGlesError into AsGlowRenderer

Browse source
This commit is contained in:
Victoria Brekenfeld 2026-03-04 16:57:17 +01:00 • committed by Victoria Brekenfeld
parent 0ce7f11445
commit 8b990e5658
8 changed files with 40 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/shell/element/mod.rs
View file

@ -1,5 +1,5 @@
use crate::{
backend::render::element::{AsGlowRenderer, FromGlesError},
backend::render::element::AsGlowRenderer,
state::State,
utils::{iced::IcedElementInternal, prelude::*},
};
@ -1366,7 +1366,6 @@ impl<R> RenderElement<R> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
fn draw(
&self,
@ -1399,7 +1398,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error),
.map_err(R::from_gles_error),
CosmicMappedRenderElement::MovingStack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
@ -1421,7 +1420,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error),
.map_err(R::from_gles_error),
CosmicMappedRenderElement::Overlay(elem) => RenderElement::<GlowRenderer>::draw(
elem,
R::glow_frame_mut(frame),
@ -1431,7 +1430,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error),
.map_err(R::from_gles_error),
CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
@ -1447,7 +1446,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
}
}
@ -1510,7 +1509,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicMappedRenderElement::MovingStack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
@ -1532,7 +1531,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicMappedRenderElement::Overlay(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
@ -1542,7 +1541,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
@ -1553,7 +1552,7 @@ where
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
}
}

12
src/shell/element/stack.rs
View file

@ -4,11 +4,8 @@ use super::{
};
use crate::{
backend::render::{
IndicatorShader, Key, Usage,
clipped_surface::ClippedSurfaceRenderElement,
cursor::CursorState,
element::{AsGlowRenderer, FromGlesError},
shadow::ShadowShader,
IndicatorShader, Key, Usage, clipped_surface::ClippedSurfaceRenderElement,
cursor::CursorState, element::AsGlowRenderer, shadow::ShadowShader,
},
hooks::{Decorations, HOOKS},
shell::{
@ -2039,7 +2036,6 @@ impl<R> RenderElement<R> for CosmicStackRenderElement<R>
where
R: AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
fn draw(
&self,
@ -2064,7 +2060,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicStackRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
@ -2105,7 +2101,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicStackRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)

12
src/shell/element/window.rs
View file

@ -1,10 +1,7 @@
use crate::{
backend::render::{
IndicatorShader, Key, Usage,
clipped_surface::ClippedSurfaceRenderElement,
cursor::CursorState,
element::{AsGlowRenderer, FromGlesError},
shadow::ShadowShader,
IndicatorShader, Key, Usage, clipped_surface::ClippedSurfaceRenderElement,
cursor::CursorState, element::AsGlowRenderer, shadow::ShadowShader,
},
hooks::{Decorations, HOOKS},
shell::{
@ -1406,7 +1403,6 @@ impl<R> RenderElement<R> for CosmicWindowRenderElement<R>
where
R: AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
fn draw(
&self,
@ -1431,7 +1427,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicWindowRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
@ -1472,7 +1468,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
CosmicWindowRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)

10
src/shell/workspace.rs
View file

@ -2,10 +2,7 @@ use crate::shell::focus::FocusTarget;
use crate::shell::layout::tiling::RestoreTilingState;
use crate::wayland::handlers::xdg_activation::ActivationContext;
use crate::{
backend::render::{
BackdropShader,
element::{AsGlowRenderer, FromGlesError},
},
backend::render::{BackdropShader, element::AsGlowRenderer},
shell::{
ANIMATION_DURATION, OverviewMode, SeatMoveGrabState,
layout::{
@ -2138,7 +2135,6 @@ impl<R> RenderElement<R> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
fn draw(
&self,
@ -2171,7 +2167,7 @@ where
opaque_regions,
cache,
)
.map_err(FromGlesError::from_gles_error),
.map_err(R::from_gles_error),
}
}
@ -2218,7 +2214,7 @@ where
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
.map_err(R::from_gles_error)
}
}
}