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

17
src/backend/kms/render/gles.rs
View file

@ -12,10 +12,9 @@ use smithay::{
}, },
drm::{CreateDrmNodeError, DrmNode}, drm::{CreateDrmNodeError, DrmNode},
renderer::{ renderer::{
RendererSuper,
gles::{GlesError, GlesRenderer, ffi}, gles::{GlesError, GlesRenderer, ffi},
glow::GlowRenderer, glow::GlowRenderer,
multigpu::{ApiDevice, Error as MultiError, GraphicsApi}, multigpu::{ApiDevice, GraphicsApi},
}, },
}, },
reexports::drm::control::Device, reexports::drm::control::Device,
@ -32,8 +31,6 @@ use std::{
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
}; };
use crate::backend::render::element::FromGlesError;
/// Errors raised by the [`GbmGlesBackend`] /// Errors raised by the [`GbmGlesBackend`]
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum Error { pub enum Error {
@ -213,15 +210,3 @@ impl ApiDevice for GbmGlowDevice {
!self.intel_export_quirk !self.intel_export_quirk
} }
} }
impl<T: GraphicsApi, A: AsFd + Device + Clone + 'static> FromGlesError
for MultiError<GbmGlowBackend<A>, T>
where
T::Error: 'static,
<<T::Device as ApiDevice>::Renderer as RendererSuper>::Error: 'static,
{
#[inline]
fn from_gles_error(err: GlesError) -> MultiError<GbmGlowBackend<A>, T> {
MultiError::Render(err)
}
}

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

@ -1,4 +1,7 @@
use crate::shell::{CosmicMappedRenderElement, WorkspaceRenderElement}; use crate::{
backend::render::GlMultiError,
shell::{CosmicMappedRenderElement, WorkspaceRenderElement},
};
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
use smithay::backend::renderer::element::texture::TextureRenderElement; use smithay::backend::renderer::element::texture::TextureRenderElement;
@ -203,7 +206,6 @@ impl<R> RenderElement<R> for CosmicElement<R>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: 'static, R::TextureId: 'static,
R::Error: FromGlesError,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
{ {
fn draw( fn draw(
@ -237,7 +239,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache), CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache),
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
@ -252,7 +254,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
} }
} }
@ -293,7 +295,7 @@ where
RenderElement::<GlowRenderer>::capture_framebuffer( RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache, elem, glow_frame, src, dst, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicElement::Zoom(elem) => elem.capture_framebuffer(frame, src, dst, cache), CosmicElement::Zoom(elem) => elem.capture_framebuffer(frame, src, dst, cache),
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
@ -302,7 +304,7 @@ where
RenderElement::<GlowRenderer>::capture_framebuffer( RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache, elem, glow_frame, src, dst, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
} }
} }
@ -365,6 +367,7 @@ pub trait AsGlowRenderer:
fn glow_frame_mut<'a, 'frame, 'buffer>( fn glow_frame_mut<'a, 'frame, 'buffer>(
frame: &'a mut Self::Frame<'frame, 'buffer>, frame: &'a mut Self::Frame<'frame, 'buffer>,
) -> &'a mut GlowFrame<'frame, 'buffer>; ) -> &'a mut GlowFrame<'frame, 'buffer>;
fn from_gles_error(err: GlesError) -> Self::Error;
} }
impl AsGlowRenderer for GlowRenderer { impl AsGlowRenderer for GlowRenderer {
@ -384,6 +387,9 @@ impl AsGlowRenderer for GlowRenderer {
) -> &'a mut GlowFrame<'frame, 'buffer> { ) -> &'a mut GlowFrame<'frame, 'buffer> {
frame frame
} }
fn from_gles_error(err: GlesError) -> Self::Error {
err
}
} }
impl AsGlowRenderer for GlMultiRenderer<'_> { impl AsGlowRenderer for GlMultiRenderer<'_> {
@ -403,6 +409,9 @@ impl AsGlowRenderer for GlMultiRenderer<'_> {
) -> &'b mut GlowFrame<'frame, 'buffer> { ) -> &'b mut GlowFrame<'frame, 'buffer> {
frame.as_mut() frame.as_mut()
} }
fn from_gles_error(err: GlesError) -> Self::Error {
GlMultiError::Render(err)
}
} }
pub struct DamageElement { pub struct DamageElement {
@ -458,13 +467,3 @@ impl<R: Renderer> RenderElement<R> for DamageElement {
Ok(()) Ok(())
} }
} }
pub trait FromGlesError {
fn from_gles_error(err: GlesError) -> Self;
}
impl FromGlesError for GlesError {
fn from_gles_error(err: GlesError) -> Self {
err
}
}

7
src/backend/render/mod.rs
View file

@ -42,7 +42,6 @@ use crate::{
}; };
use cosmic::Theme; use cosmic::Theme;
use element::FromGlesError;
use smithay::{ use smithay::{
backend::{ backend::{
allocator::Fourcc, allocator::Fourcc,
@ -628,7 +627,6 @@ pub fn output_elements<R>(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
WorkspaceRenderElement<R>: RenderElement<R>, WorkspaceRenderElement<R>: RenderElement<R>,
{ {
@ -655,7 +653,7 @@ where
), ),
scale, scale,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
.map_err(RenderError::Rendering)? .map_err(RenderError::Rendering)?
.into(), .into(),
] ]
@ -728,7 +726,6 @@ pub fn workspace_elements<R>(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
WorkspaceRenderElement<R>: RenderElement<R>, WorkspaceRenderElement<R>: RenderElement<R>,
{ {
@ -1205,7 +1202,6 @@ pub fn render_output<'d, R>(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicElement<R>: RenderElement<R>, CosmicElement<R>: RenderElement<R>,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
WorkspaceRenderElement<R>: RenderElement<R>, WorkspaceRenderElement<R>: RenderElement<R>,
@ -1510,7 +1506,6 @@ pub fn render_workspace<'d, R>(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicElement<R>: RenderElement<R>, CosmicElement<R>: RenderElement<R>,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
WorkspaceRenderElement<R>: RenderElement<R>, WorkspaceRenderElement<R>: RenderElement<R>,

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

@ -1,5 +1,5 @@
use crate::{ use crate::{
backend::render::element::{AsGlowRenderer, FromGlesError}, backend::render::element::AsGlowRenderer,
state::State, state::State,
utils::{iced::IcedElementInternal, prelude::*}, utils::{iced::IcedElementInternal, prelude::*},
}; };
@ -1366,7 +1366,6 @@ impl<R> RenderElement<R> for CosmicMappedRenderElement<R>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: 'static, R::TextureId: 'static,
R::Error: FromGlesError,
{ {
fn draw( fn draw(
&self, &self,
@ -1399,7 +1398,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(R::from_gles_error),
CosmicMappedRenderElement::MovingStack(elem) => { CosmicMappedRenderElement::MovingStack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
@ -1421,7 +1420,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(R::from_gles_error),
CosmicMappedRenderElement::Overlay(elem) => RenderElement::<GlowRenderer>::draw( CosmicMappedRenderElement::Overlay(elem) => RenderElement::<GlowRenderer>::draw(
elem, elem,
R::glow_frame_mut(frame), R::glow_frame_mut(frame),
@ -1431,7 +1430,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(R::from_gles_error),
CosmicMappedRenderElement::StackHoverIndicator(elem) => { CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
@ -1447,7 +1446,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
} }
} }
@ -1510,7 +1509,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicMappedRenderElement::MovingStack(elem) => { CosmicMappedRenderElement::MovingStack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache) elem.capture_framebuffer(frame, src, dst, cache)
@ -1532,7 +1531,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicMappedRenderElement::Overlay(elem) => { CosmicMappedRenderElement::Overlay(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer( RenderElement::<GlowRenderer>::capture_framebuffer(
@ -1542,7 +1541,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicMappedRenderElement::StackHoverIndicator(elem) => { CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.capture_framebuffer(frame, src, dst, cache) elem.capture_framebuffer(frame, src, dst, cache)
@ -1553,7 +1552,7 @@ where
RenderElement::<GlowRenderer>::capture_framebuffer( RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache, 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::{ use crate::{
backend::render::{ backend::render::{
IndicatorShader, Key, Usage, IndicatorShader, Key, Usage, clipped_surface::ClippedSurfaceRenderElement,
clipped_surface::ClippedSurfaceRenderElement, cursor::CursorState, element::AsGlowRenderer, shadow::ShadowShader,
cursor::CursorState,
element::{AsGlowRenderer, FromGlesError},
shadow::ShadowShader,
}, },
hooks::{Decorations, HOOKS}, hooks::{Decorations, HOOKS},
shell::{ shell::{
@ -2039,7 +2036,6 @@ impl<R> RenderElement<R> for CosmicStackRenderElement<R>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: 'static, R::TextureId: 'static,
R::Error: FromGlesError,
{ {
fn draw( fn draw(
&self, &self,
@ -2064,7 +2060,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicStackRenderElement::Window(elem) => { CosmicStackRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache) elem.draw(frame, src, dst, damage, opaque_regions, cache)
@ -2105,7 +2101,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicStackRenderElement::Window(elem) => { CosmicStackRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache) elem.capture_framebuffer(frame, src, dst, cache)

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

@ -1,10 +1,7 @@
use crate::{ use crate::{
backend::render::{ backend::render::{
IndicatorShader, Key, Usage, IndicatorShader, Key, Usage, clipped_surface::ClippedSurfaceRenderElement,
clipped_surface::ClippedSurfaceRenderElement, cursor::CursorState, element::AsGlowRenderer, shadow::ShadowShader,
cursor::CursorState,
element::{AsGlowRenderer, FromGlesError},
shadow::ShadowShader,
}, },
hooks::{Decorations, HOOKS}, hooks::{Decorations, HOOKS},
shell::{ shell::{
@ -1406,7 +1403,6 @@ impl<R> RenderElement<R> for CosmicWindowRenderElement<R>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: 'static, R::TextureId: 'static,
R::Error: FromGlesError,
{ {
fn draw( fn draw(
&self, &self,
@ -1431,7 +1427,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicWindowRenderElement::Window(elem) => { CosmicWindowRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache) elem.draw(frame, src, dst, damage, opaque_regions, cache)
@ -1472,7 +1468,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
CosmicWindowRenderElement::Window(elem) => { CosmicWindowRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache) 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::shell::layout::tiling::RestoreTilingState;
use crate::wayland::handlers::xdg_activation::ActivationContext; use crate::wayland::handlers::xdg_activation::ActivationContext;
use crate::{ use crate::{
backend::render::{ backend::render::{BackdropShader, element::AsGlowRenderer},
BackdropShader,
element::{AsGlowRenderer, FromGlesError},
},
shell::{ shell::{
ANIMATION_DURATION, OverviewMode, SeatMoveGrabState, ANIMATION_DURATION, OverviewMode, SeatMoveGrabState,
layout::{ layout::{
@ -2138,7 +2135,6 @@ impl<R> RenderElement<R> for WorkspaceRenderElement<R>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: 'static, R::TextureId: 'static,
R::Error: FromGlesError,
{ {
fn draw( fn draw(
&self, &self,
@ -2171,7 +2167,7 @@ where
opaque_regions, opaque_regions,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(R::from_gles_error),
} }
} }
@ -2218,7 +2214,7 @@ where
dst, dst,
cache, cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(R::from_gles_error)
} }
} }
} }

11
src/wayland/handlers/image_copy_capture/render.rs
View file

@ -41,7 +41,7 @@ use tracing::warn;
use crate::{ use crate::{
backend::render::{ backend::render::{
CursorMode, ElementFilter, RendererRef, cursor, CursorMode, ElementFilter, RendererRef, cursor,
element::{AsGlowRenderer, CosmicElement, DamageElement, FromGlesError}, element::{AsGlowRenderer, CosmicElement, DamageElement},
render_workspace, render_workspace,
}, },
shell::{CosmicMappedRenderElement, CosmicSurface, WorkspaceRenderElement}, shell::{CosmicMappedRenderElement, CosmicSurface, WorkspaceRenderElement},
@ -105,8 +105,7 @@ pub fn submit_buffer<R>(
mut sync: SyncPoint, mut sync: SyncPoint,
) -> Result<Option<PendingImageCopyData>, R::Error> ) -> Result<Option<PendingImageCopyData>, R::Error>
where where
R: ExportMem, R: ExportMem + AsGlowRenderer,
R::Error: FromGlesError,
{ {
let Some(damage) = damage else { let Some(damage) = damage else {
frame.success( frame.success(
@ -164,7 +163,7 @@ where
Ok(()) Ok(())
}) })
.map_err(|err| R::Error::from_gles_error(GlesError::BufferAccessError(err))) .map_err(|err| R::from_gles_error(GlesError::BufferAccessError(err)))
.and_then(|x| x) .and_then(|x| x)
{ {
frame.fail(CaptureFailureReason::Unknown); frame.fail(CaptureFailureReason::Unknown);
@ -194,7 +193,6 @@ pub fn render_session<F, R>(
) -> Result<Option<PendingImageCopyData>, DTError<R::Error>> ) -> Result<Option<PendingImageCopyData>, DTError<R::Error>>
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::Error: FromGlesError,
F: for<'d> FnOnce( F: for<'d> FnOnce(
&WlBuffer, &WlBuffer,
&mut R, &mut R,
@ -321,7 +319,6 @@ pub fn render_workspace_to_buffer(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicElement<R>: RenderElement<R>, CosmicElement<R>: RenderElement<R>,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
WorkspaceRenderElement<R>: RenderElement<R>, WorkspaceRenderElement<R>: RenderElement<R>,
@ -554,7 +551,6 @@ pub fn render_window_to_buffer(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicElement<R>: RenderElement<R>, CosmicElement<R>: RenderElement<R>,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
{ {
@ -793,7 +789,6 @@ pub fn render_cursor_to_buffer(
where where
R: AsGlowRenderer, R: AsGlowRenderer,
R::TextureId: Send + Clone + 'static, R::TextureId: Send + Clone + 'static,
R::Error: FromGlesError,
CosmicElement<R>: RenderElement<R>, CosmicElement<R>: RenderElement<R>,
CosmicMappedRenderElement<R>: RenderElement<R>, CosmicMappedRenderElement<R>: RenderElement<R>,
{ {