render: Merge FromGlesError into AsGlowRenderer
This commit is contained in:
parent
0ce7f11445
commit
8b990e5658
8 changed files with 40 additions and 79 deletions
|
|
@ -12,10 +12,9 @@ use smithay::{
|
|||
},
|
||||
drm::{CreateDrmNodeError, DrmNode},
|
||||
renderer::{
|
||||
RendererSuper,
|
||||
gles::{GlesError, GlesRenderer, ffi},
|
||||
glow::GlowRenderer,
|
||||
multigpu::{ApiDevice, Error as MultiError, GraphicsApi},
|
||||
multigpu::{ApiDevice, GraphicsApi},
|
||||
},
|
||||
},
|
||||
reexports::drm::control::Device,
|
||||
|
|
@ -32,8 +31,6 @@ use std::{
|
|||
sync::atomic::{AtomicBool, Ordering},
|
||||
};
|
||||
|
||||
use crate::backend::render::element::FromGlesError;
|
||||
|
||||
/// Errors raised by the [`GbmGlesBackend`]
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum Error {
|
||||
|
|
@ -213,15 +210,3 @@ impl ApiDevice for GbmGlowDevice {
|
|||
!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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue