skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to glow 0.13 (#3715)

This commit is contained in:
Emil Ernerfeldt 2023-12-18 15:15:20 +01:00 committed by GitHub
parent 8e5959d55d
commit 449678e617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@ -1169,7 +1169,7 @@ dependencies = [
"egui-wgpu", "egui-wgpu",
"egui-winit", "egui-winit",
"egui_glow", "egui_glow",
"glow 0.12.3", "glow",
"glutin", "glutin",
"glutin-winit", "glutin-winit",
"image", "image",
@ -1308,7 +1308,7 @@ dependencies = [
"document-features", "document-features",
"egui", "egui",
"egui-winit", "egui-winit",
"glow 0.12.3", "glow",
"glutin", "glutin",
"glutin-winit", "glutin-winit",
"log", "log",
@ -1766,18 +1766,6 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "glow"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
dependencies = [
"js-sys",
"slotmap",
"wasm-bindgen",
"web-sys",
]
[[package]] [[package]]
name = "glow" name = "glow"
version = "0.13.0" version = "0.13.0"
@ -4286,7 +4274,7 @@ dependencies = [
"block", "block",
"core-graphics-types", "core-graphics-types",
"d3d12", "d3d12",
"glow 0.13.0", "glow",
"glutin_wgl_sys", "glutin_wgl_sys",
"gpu-alloc", "gpu-alloc",
"gpu-allocator", "gpu-allocator",

1
Cargo.toml
View File

@ -49,6 +49,7 @@ opt-level = 2
[workspace.dependencies] [workspace.dependencies]
criterion = { version = "0.5.1", default-features = false } criterion = { version = "0.5.1", default-features = false }
glow = "0.13"
puffin = "0.18" puffin = "0.18"
raw-window-handle = "0.5.0" raw-window-handle = "0.5.0"
thiserror = "1.0.37" thiserror = "1.0.37"

2
crates/eframe/Cargo.toml
View File

@ -116,7 +116,7 @@ thiserror.workspace = true
document-features = { version = "0.2", optional = true } document-features = { version = "0.2", optional = true }
egui_glow = { version = "0.24.1", path = "../egui_glow", optional = true, default-features = false } egui_glow = { version = "0.24.1", path = "../egui_glow", optional = true, default-features = false }
glow = { version = "0.12", optional = true } glow = { workspace = true, optional = true }
ron = { version = "0.8", optional = true, features = ["integer128"] } ron = { version = "0.8", optional = true, features = ["integer128"] }
serde = { version = "1", optional = true, features = ["derive"] } serde = { version = "1", optional = true, features = ["derive"] }

2
crates/eframe/src/native/glow_integration.rs
View File

@ -5,6 +5,8 @@
//! There is a bunch of improvements we could do, //! There is a bunch of improvements we could do,
//! like removing a bunch of `unwraps`. //! like removing a bunch of `unwraps`.
#![allow(clippy::arc_with_non_send_sync)] // glow::Context was accidentally non-Sync in glow 0.13, but that will be fixed in future releases of glow: https://github.com/grovesNL/glow/commit/c4a5f7151b9b4bbb380faa06ec27415235d1bf7e
use std::{cell::RefCell, rc::Rc, sync::Arc, time::Instant}; use std::{cell::RefCell, rc::Rc, sync::Arc, time::Instant};
use glutin::{ use glutin::{

2
crates/egui_glow/Cargo.toml
View File

@ -49,7 +49,7 @@ egui = { version = "0.24.1", path = "../egui", default-features = false, feature
] } ] }
bytemuck = "1.7" bytemuck = "1.7"
glow = "0.12" glow.workspace = true
log = { version = "0.4", features = ["std"] } log = { version = "0.4", features = ["std"] }
memoffset = "0.7" memoffset = "0.7"

1
crates/egui_glow/examples/pure_glow.rs
View File

@ -2,6 +2,7 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
#![allow(unsafe_code)] #![allow(unsafe_code)]
#![allow(clippy::arc_with_non_send_sync)] // glow::Context was accidentally non-Sync in glow 0.13, but that will be fixed in future releases of glow: https://github.com/grovesNL/glow/commit/c4a5f7151b9b4bbb380faa06ec27415235d1bf7e
use egui_winit::winit; use egui_winit::winit;

24
deny.toml
View File

@ -34,19 +34,17 @@ deny = [
] ]
skip = [ skip = [
{ name = "arrayvec" }, # old version via tiny-skiaz { name = "arrayvec" }, # old version via tiny-skiaz
{ name = "base64" }, # small crate, old version from usvg { name = "base64" }, # small crate, old version from usvg
{ name = "bitflags" }, # old 1.0 version via glutin, png, spirv, … { name = "bitflags" }, # old 1.0 version via glutin, png, spirv, …
{ name = "glow" }, # TODO(@wumpf): updatere glow { name = "libloading" }, # wgpu-hal itself depends on 0.8 while some of its dependencies, like ash and d3d12, depend on 0.7
{ name = "glutin_wgl_sys" }, # TODO(@wumpf): updatere glow { name = "memoffset" }, # tiny dependency
{ name = "libloading" }, # wgpu-hal itself depends on 0.8 while some of its dependencies, like ash and d3d12, depend on 0.7 { name = "quick-xml" }, # old version via wayland-scanner
{ name = "memoffset" }, # tiny dependency { name = "redox_syscall" }, # old version via directories-next
{ name = "quick-xml" }, # old version via wayland-scanner { name = "spin" }, # old version via ring through rusttls and other libraries, newer for wgpu.
{ name = "redox_syscall" }, # old version via directories-next { name = "time" }, # old version pulled in by unmaintianed crate 'chrono'
{ name = "spin" }, # old version via ring through rusttls and other libraries, newer for wgpu. { name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg
{ name = "time" }, # old version pulled in by unmaintianed crate 'chrono' { name = "windows" }, # old version via accesskit_windows
{ name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg
{ name = "windows" }, # old version via accesskit_windows
] ]
skip-tree = [ skip-tree = [
{ name = "criterion" }, # dev-dependency { name = "criterion" }, # dev-dependency