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

deps: Update egui

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-05-03 19:47:48 +02:00
parent 521d1b149b
commit ea1b976076
5 changed files with 40 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use smithay::{
#[cfg(feature = "debug")]
use smithay::backend::renderer::{
element::texture::TextureRenderElement, gles2::Gles2Texture, multigpu::Error as MultiError,
element::texture::TextureRenderElement, gles::GlesTexture, multigpu::Error as MultiError,
};
use super::{cursor::CursorRenderElement, GlMultiFrame, GlMultiRenderer};
@ -26,7 +26,7 @@ where
Cursor(CursorRenderElement<R>),
MoveGrab(CosmicMappedRenderElement<R>),
#[cfg(feature = "debug")]
Egui(TextureRenderElement<Gles2Texture>),
Egui(TextureRenderElement<GlesTexture>),
}
impl<R> Element for CosmicElement<R>
@ -230,13 +230,13 @@ where
}
#[cfg(feature = "debug")]
impl<R> From<TextureRenderElement<Gles2Texture>> for CosmicElement<R>
impl<R> From<TextureRenderElement<GlesTexture>> for CosmicElement<R>
where
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
<R as Renderer>::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
fn from(elem: TextureRenderElement<Gles2Texture>) -> Self {
fn from(elem: TextureRenderElement<GlesTexture>) -> Self {
Self::Egui(elem)
}
}

6
src/debug.rs
View file

@ -15,7 +15,7 @@ use smithay::{
drm::DrmNode,
renderer::{
element::texture::TextureRenderElement,
gles2::{Gles2Error, Gles2Texture},
gles::{GlesError, GlesTexture},
glow::GlowRenderer,
},
},
@ -34,7 +34,7 @@ pub fn profiler_ui(
renderer: &mut GlowRenderer,
area: Rectangle<i32, Logical>,
scale: f64,
) -> Result<Option<TextureRenderElement<Gles2Texture>>, Gles2Error> {
) -> Result<Option<TextureRenderElement<GlesTexture>>, GlesError> {
if !state.egui.active {
return Ok(None);
}
@ -61,7 +61,7 @@ pub fn fps_ui(
fps: &mut Fps,
area: Rectangle<i32, Logical>,
scale: f64,
) -> Result<TextureRenderElement<Gles2Texture>, Gles2Error> {
) -> Result<TextureRenderElement<GlesTexture>, GlesError> {
use egui::widgets::plot::{Bar, BarChart, Legend, Plot};
let (max, min, avg, avg_fps) = (

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

@ -55,7 +55,7 @@ use self::window::CosmicWindowRenderElement;
#[cfg(feature = "debug")]
use egui::plot::{Corner, Legend, Plot, PlotPoints, Polygon};
#[cfg(feature = "debug")]
use smithay::backend::renderer::{element::texture::TextureRenderElement, gles2::Gles2Texture};
use smithay::backend::renderer::{element::texture::TextureRenderElement, gles::GlesTexture};
#[cfg(feature = "debug")]
use tracing::debug;
@ -678,7 +678,7 @@ where
Window(self::window::CosmicWindowRenderElement<R>),
Indicator(PixelShaderElement),
#[cfg(feature = "debug")]
Egui(TextureRenderElement<Gles2Texture>),
Egui(TextureRenderElement<GlesTexture>),
}
impl<R> Element for CosmicMappedRenderElement<R>
@ -886,13 +886,13 @@ where
}
#[cfg(feature = "debug")]
impl<R> From<TextureRenderElement<Gles2Texture>> for CosmicMappedRenderElement<R>
impl<R> From<TextureRenderElement<GlesTexture>> for CosmicMappedRenderElement<R>
where
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
<R as Renderer>::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
fn from(elem: TextureRenderElement<Gles2Texture>) -> Self {
fn from(elem: TextureRenderElement<GlesTexture>) -> Self {
CosmicMappedRenderElement::Egui(elem)
}
}