From c48dc1107fa60f64492c6e168b0f0e729dff3a40 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 20 Aug 2024 11:51:52 -0700 Subject: [PATCH] Update `smithay` and `smithay-egui` --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- src/backend/render/mod.rs | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6563bd6..fcfbec48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4703,7 +4703,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=c484442#c4844428f8de024222a44cd906060f2af77f4ba1" +source = "git+https://github.com/smithay//smithay?rev=e27fd27#e27fd27caba5238fac8a592f6dff32b430efb272" dependencies = [ "appendlist", "ash 0.38.0+1.3.281", @@ -4794,7 +4794,7 @@ dependencies = [ [[package]] name = "smithay-egui" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0#cdc652e0d4823b16a5bd9badd288e38512789dc5" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=0d0b4ca0#0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5" dependencies = [ "cgmath", "egui", diff --git a/Cargo.toml b/Cargo.toml index b46c7aa8..8125f42c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ version = "0.3" features = ["svg"] git = "https://github.com/Smithay/smithay-egui.git" optional = true -rev = "cdc652e0" +rev = "0d0b4ca0" [features] debug = ["egui", "egui_plot", "smithay-egui", "anyhow/backtrace"] @@ -116,4 +116,4 @@ inherits = "release" lto = "fat" [patch."https://github.com/Smithay/smithay.git"] -smithay = { git = "https://github.com/smithay//smithay", rev = "c484442" } +smithay = { git = "https://github.com/smithay//smithay", rev = "e27fd27" } diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs index 29fecb53..d1908458 100644 --- a/src/backend/render/mod.rs +++ b/src/backend/render/mod.rs @@ -56,7 +56,8 @@ use smithay::{ glow::GlowRenderer, multigpu::{Error as MultiError, MultiFrame, MultiRenderer}, sync::SyncPoint, - Bind, Blit, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, TextureFilter, + Bind, Blit, Color32F, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, + TextureFilter, }, }, desktop::{layer_map_for_output, PopupManager}, @@ -110,7 +111,7 @@ impl<'a> AsMut for RendererRef<'a> { } } -pub static CLEAR_COLOR: [f32; 4] = [0.153, 0.161, 0.165, 1.0]; +pub static CLEAR_COLOR: Color32F = Color32F::new(0.153, 0.161, 0.165, 1.0); pub static OUTLINE_SHADER: &str = include_str!("./shaders/rounded_outline.frag"); pub static RECTANGLE_SHADER: &str = include_str!("./shaders/rounded_rectangle.frag"); pub static GROUP_COLOR: [f32; 3] = [0.788, 0.788, 0.788];