render: Merge FromGlesError into AsGlowRenderer
This commit is contained in:
parent
0ce7f11445
commit
8b990e5658
8 changed files with 40 additions and 79 deletions
|
|
@ -42,7 +42,6 @@ use crate::{
|
|||
};
|
||||
|
||||
use cosmic::Theme;
|
||||
use element::FromGlesError;
|
||||
use smithay::{
|
||||
backend::{
|
||||
allocator::Fourcc,
|
||||
|
|
@ -628,7 +627,6 @@ pub fn output_elements<R>(
|
|||
where
|
||||
R: AsGlowRenderer,
|
||||
R::TextureId: Send + Clone + 'static,
|
||||
R::Error: FromGlesError,
|
||||
CosmicMappedRenderElement<R>: RenderElement<R>,
|
||||
WorkspaceRenderElement<R>: RenderElement<R>,
|
||||
{
|
||||
|
|
@ -655,7 +653,7 @@ where
|
|||
),
|
||||
scale,
|
||||
)
|
||||
.map_err(FromGlesError::from_gles_error)
|
||||
.map_err(R::from_gles_error)
|
||||
.map_err(RenderError::Rendering)?
|
||||
.into(),
|
||||
]
|
||||
|
|
@ -728,7 +726,6 @@ pub fn workspace_elements<R>(
|
|||
where
|
||||
R: AsGlowRenderer,
|
||||
R::TextureId: Send + Clone + 'static,
|
||||
R::Error: FromGlesError,
|
||||
CosmicMappedRenderElement<R>: RenderElement<R>,
|
||||
WorkspaceRenderElement<R>: RenderElement<R>,
|
||||
{
|
||||
|
|
@ -1205,7 +1202,6 @@ pub fn render_output<'d, R>(
|
|||
where
|
||||
R: AsGlowRenderer,
|
||||
R::TextureId: Send + Clone + 'static,
|
||||
R::Error: FromGlesError,
|
||||
CosmicElement<R>: RenderElement<R>,
|
||||
CosmicMappedRenderElement<R>: RenderElement<R>,
|
||||
WorkspaceRenderElement<R>: RenderElement<R>,
|
||||
|
|
@ -1510,7 +1506,6 @@ pub fn render_workspace<'d, R>(
|
|||
where
|
||||
R: AsGlowRenderer,
|
||||
R::TextureId: Send + Clone + 'static,
|
||||
R::Error: FromGlesError,
|
||||
CosmicElement<R>: RenderElement<R>,
|
||||
CosmicMappedRenderElement<R>: RenderElement<R>,
|
||||
WorkspaceRenderElement<R>: RenderElement<R>,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue