Skip to content

Update glow to 0.16 #5395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Update glow to 0.16 #5395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86916b3
Update glow to 0.16
sagudev Nov 21, 2024
8c7f456
Allow duplicated glow versions
sagudev Nov 26, 2024
a970993
Merge branch 'emilk:master' into glow16
sagudev Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ dependencies = [
"egui-wgpu",
"egui-winit",
"egui_glow",
"glow",
"glow 0.16.0",
"glutin",
"glutin-winit",
"home",
Expand Down Expand Up @@ -1346,7 +1346,7 @@ dependencies = [
"document-features",
"egui",
"egui-winit",
"glow",
"glow 0.16.0",
"glutin",
"glutin-winit",
"log",
Expand Down Expand Up @@ -1830,6 +1830,18 @@ dependencies = [
"web-sys",
]

[[package]]
name = "glow"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
dependencies = [
"js-sys",
"slotmap",
"wasm-bindgen",
"web-sys",
]

[[package]]
name = "glutin"
version = "0.32.1"
Expand Down Expand Up @@ -4406,7 +4418,7 @@ dependencies = [
"bytemuck",
"cfg_aliases 0.1.1",
"core-graphics-types",
"glow",
"glow 0.14.2",
"glutin_wgl_sys",
"gpu-alloc",
"gpu-descriptor",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bytemuck = "1.7.2"
criterion = { version = "0.5.1", default-features = false }
dify = { version = "0.7", default-features = false }
document-features = "0.2.10"
glow = "0.14"
glow = "0.16"
glutin = { version = "0.32.0", default-features = false }
glutin-winit = { version = "0.5.0", default-features = false }
home = "0.5.9"
Expand Down
8 changes: 4 additions & 4 deletions crates/egui_glow/src/painter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ impl Painter {
h as _,
src_format,
glow::UNSIGNED_BYTE,
glow::PixelUnpackData::Slice(data),
glow::PixelUnpackData::Slice(Some(data)),
);
check_for_gl_error!(&self.gl, "tex_sub_image_2d");
} else {
Expand All @@ -635,7 +635,7 @@ impl Painter {
border,
src_format,
glow::UNSIGNED_BYTE,
Some(data),
glow::PixelUnpackData::Slice(Some(data)),
);
check_for_gl_error!(&self.gl, "tex_image_2d");
}
Expand Down Expand Up @@ -686,7 +686,7 @@ impl Painter {
h as _,
glow::RGBA,
glow::UNSIGNED_BYTE,
glow::PixelPackData::Slice(&mut pixels),
glow::PixelPackData::Slice(Some(&mut pixels)),
);
}
let mut flipped = Vec::with_capacity((w * h * 4) as usize);
Expand All @@ -711,7 +711,7 @@ impl Painter {
h as _,
glow::RGB,
glow::UNSIGNED_BYTE,
glow::PixelPackData::Slice(&mut pixels),
glow::PixelPackData::Slice(Some(&mut pixels)),
);
}
pixels
Expand Down
1 change: 1 addition & 0 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ skip = [
{ name = "cfg_aliases" }, # old version via wgpu
{ name = "event-listener" }, # TODO(emilk): rustls pulls in two versions of this 😭
{ name = "futures-lite" }, # old version via accesskit_unix and zbus
{ name = "glow" }, # old version via wgpu
{ name = "memoffset" }, # tiny dependency
{ name = "ndk-sys" }, # old version via wgpu, winit uses newer version
{ name = "quick-xml" }, # old version via wayland-scanner
Expand Down