Skip to content

Commit

Permalink
Update glow to 0.16
Browse files Browse the repository at this point in the history
Signed-off-by: sagudev <[email protected]>
  • Loading branch information
sagudev committed Nov 21, 2024
1 parent 83a3006 commit 4a2da93
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
22 changes: 17 additions & 5 deletions Cargo.lock
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 @@ -1345,7 +1345,7 @@ dependencies = [
"document-features",
"egui",
"egui-winit",
"glow",
"glow 0.16.0",
"glutin",
"glutin-winit",
"log",
Expand Down Expand Up @@ -1829,6 +1829,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 @@ -2261,7 +2273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
"windows-targets 0.48.5",
"windows-targets 0.52.6",
]

[[package]]
Expand Down Expand Up @@ -4405,7 +4417,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 Expand Up @@ -4465,7 +4477,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.59.0",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
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 = "0.32.0"
glutin-winit = "0.5.0"
home = "0.5.9"
Expand Down
8 changes: 4 additions & 4 deletions crates/egui_glow/src/painter.rs
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

0 comments on commit 4a2da93

Please sign in to comment.