Skip to content

Commit

Permalink
Update to glow 0.13 (#3715)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk authored Dec 18, 2023
1 parent 8e5959d commit 449678e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 30 deletions.
18 changes: 3 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ opt-level = 2

[workspace.dependencies]
criterion = { version = "0.5.1", default-features = false }
glow = "0.13"
puffin = "0.18"
raw-window-handle = "0.5.0"
thiserror = "1.0.37"
Expand Down
2 changes: 1 addition & 1 deletion crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ thiserror.workspace = true
document-features = { version = "0.2", optional = true }

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"] }
serde = { version = "1", optional = true, features = ["derive"] }

Expand Down
2 changes: 2 additions & 0 deletions crates/eframe/src/native/glow_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
//! There is a bunch of improvements we could do,
//! 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 glutin::{
Expand Down
2 changes: 1 addition & 1 deletion crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ egui = { version = "0.24.1", path = "../egui", default-features = false, feature
] }

bytemuck = "1.7"
glow = "0.12"
glow.workspace = true
log = { version = "0.4", features = ["std"] }
memoffset = "0.7"

Expand Down
1 change: 1 addition & 0 deletions crates/egui_glow/examples/pure_glow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
#![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;

Expand Down
24 changes: 11 additions & 13 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,17 @@ deny = [
]

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

0 comments on commit 449678e

Please sign in to comment.