deps: Update egui
This commit is contained in:
Victoria Brekenfeld
parent
521d1b149b
commit
ea1b976076
5 changed files with 40 additions and 67 deletions
81
Cargo.lock
generated
81
Cargo.lock
generated
|
|
@ -416,7 +416,7 @@ dependencies = [
|
|||
"calloop",
|
||||
"cosmic-protocols",
|
||||
"edid-rs",
|
||||
"egui 0.20.1",
|
||||
"egui",
|
||||
"glow 0.11.2",
|
||||
"iced_softbuffer",
|
||||
"id_tree",
|
||||
|
|
@ -427,7 +427,7 @@ dependencies = [
|
|||
"log-panics",
|
||||
"ordered-float",
|
||||
"png",
|
||||
"puffin",
|
||||
"puffin 0.14.3",
|
||||
"puffin_egui",
|
||||
"regex",
|
||||
"renderdoc",
|
||||
|
|
@ -799,12 +799,6 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691"
|
||||
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.21.0"
|
||||
|
|
@ -820,17 +814,6 @@ version = "0.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c"
|
||||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.20.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9"
|
||||
dependencies = [
|
||||
"ahash 0.8.3",
|
||||
"epaint 0.20.0",
|
||||
"nohash-hasher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.21.0"
|
||||
|
|
@ -838,7 +821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
|
||||
dependencies = [
|
||||
"ahash 0.8.3",
|
||||
"epaint 0.21.0",
|
||||
"epaint",
|
||||
"nohash-hasher",
|
||||
]
|
||||
|
||||
|
|
@ -848,7 +831,7 @@ version = "0.21.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f051342e97dfa2445107cb7d2e720617f5c840199b5cb4fe0ffcf481fcf5cce"
|
||||
dependencies = [
|
||||
"egui 0.21.0",
|
||||
"egui",
|
||||
"resvg 0.28.0",
|
||||
"serde",
|
||||
"tiny-skia 0.8.4",
|
||||
|
|
@ -862,7 +845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8257332fb168a965b3dca81d6a344e053153773c889cabdba0b3b76f1629ae81"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui 0.21.0",
|
||||
"egui",
|
||||
"glow 0.12.1",
|
||||
"memoffset 0.6.5",
|
||||
"tracing",
|
||||
|
|
@ -876,12 +859,6 @@ version = "1.8.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
||||
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0"
|
||||
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.21.0"
|
||||
|
|
@ -987,21 +964,6 @@ version = "0.1.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
|
||||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"ahash 0.8.3",
|
||||
"atomic_refcell",
|
||||
"ecolor 0.20.0",
|
||||
"emath 0.20.0",
|
||||
"nohash-hasher",
|
||||
"parking_lot 0.12.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.21.0"
|
||||
|
|
@ -1012,8 +974,8 @@ dependencies = [
|
|||
"ahash 0.8.3",
|
||||
"atomic_refcell",
|
||||
"bytemuck",
|
||||
"ecolor 0.21.0",
|
||||
"emath 0.21.0",
|
||||
"ecolor",
|
||||
"emath",
|
||||
"nohash-hasher",
|
||||
"parking_lot 0.12.1",
|
||||
]
|
||||
|
|
@ -2821,6 +2783,17 @@ name = "puffin"
|
|||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"instant",
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "puffin"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f99b70359a44d98fceb167734e8cc19e232fe885a547f1b622e66d8099931b6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bincode",
|
||||
|
|
@ -2835,16 +2808,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "puffin_egui"
|
||||
version = "0.19.2"
|
||||
version = "0.21.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba98235ecff9f174793e135d2c6860f917cc7cd419a630b9978f1ab5d6026a3c"
|
||||
checksum = "180408bd5816f172326f52cca2b9cc335ad36db5e40f46210f7d20ed847ce15c"
|
||||
dependencies = [
|
||||
"egui 0.20.1",
|
||||
"egui",
|
||||
"indexmap",
|
||||
"instant",
|
||||
"natord",
|
||||
"once_cell",
|
||||
"puffin",
|
||||
"puffin 0.15.0",
|
||||
"time",
|
||||
"vec1",
|
||||
]
|
||||
|
|
@ -3430,7 +3403,7 @@ version = "0.1.0"
|
|||
source = "git+https://github.com/Smithay/smithay-egui.git?rev=197606f400#197606f40067595438a90129016b1c29941c31ff"
|
||||
dependencies = [
|
||||
"cgmath",
|
||||
"egui 0.21.0",
|
||||
"egui",
|
||||
"egui_extras",
|
||||
"egui_glow",
|
||||
"image",
|
||||
|
|
@ -4824,18 +4797,18 @@ checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701"
|
|||
|
||||
[[package]]
|
||||
name = "zstd"
|
||||
version = "0.11.2+zstd.1.5.2"
|
||||
version = "0.12.3+zstd.1.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
|
||||
checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
|
||||
dependencies = [
|
||||
"zstd-safe",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zstd-safe"
|
||||
version = "5.0.2+zstd.1.5.2"
|
||||
version = "6.0.5+zstd.1.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
|
||||
checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"zstd-sys",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ calloop = { version = "0.10.1", features = ["executor"] }
|
|||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
sendfd = "0.4.1"
|
||||
egui = { version = "0.20.0", optional = true }
|
||||
egui = { version = "0.21.0", optional = true }
|
||||
renderdoc = { version = "0.10.1", optional = true }
|
||||
edid-rs = { version = "0.1" }
|
||||
png = "0.17.5"
|
||||
|
|
@ -39,7 +39,7 @@ tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-lo
|
|||
tracing-journald = "0.3.0"
|
||||
tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] }
|
||||
puffin = { version = "0.14.3", optional = true }
|
||||
puffin_egui = { version = "0.19.2", optional = true }
|
||||
puffin_egui = { version = "0.21.0", optional = true }
|
||||
|
||||
[dependencies.smithay]
|
||||
version = "0.3"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) = (
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue