Skip to content

Commit 636a39c

Browse files
authored
Update glow to 0.12 (#2695)
* Remove three-d example due to glow incompatibility * Update to glow 0.12 * Remove three-d from deny.toml * Add line to changelog
1 parent be9b5a3 commit 636a39c

File tree

12 files changed

+9
-448
lines changed

12 files changed

+9
-448
lines changed

Cargo.lock

+4-107
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/eframe/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
8080
document-features = { version = "0.2", optional = true }
8181

8282
egui_glow = { version = "0.20.0", path = "../egui_glow", optional = true, default-features = false }
83-
glow = { version = "0.11", optional = true }
83+
glow = { version = "0.12", optional = true }
8484
ron = { version = "0.8", optional = true, features = ["integer128"] }
8585
serde = { version = "1", optional = true, features = ["derive"] }
8686

crates/egui_glow/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All notable changes to the `egui_glow` integration will be noted in this file.
44

55
## Unreleased
66
* Remove the `screen_reader` feature ([#2669](https://github.com/emilk/egui/pull/2669)).
7+
* Update to `glow` 0.12 ([#2695](https://github.com/emilk/egui/pull/2695)).
78

89

910
## 0.20.1 - 2022-12-11

crates/egui_glow/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ egui = { version = "0.20.0", path = "../egui", default-features = false, feature
4949
] }
5050

5151
bytemuck = "1.7"
52-
glow = "0.11"
52+
glow = "0.12"
5353
memoffset = "0.6"
5454
tracing = { version = "0.1", default-features = false, features = ["std"] }
5555

@@ -69,7 +69,7 @@ wasm-bindgen = { version = "0.2" }
6969

7070

7171
[dev-dependencies]
72-
glutin = "0.30" # examples/pure_glow
72+
glutin = "0.30" # examples/pure_glow
7373
raw-window-handle = "0.5.0"
7474
glutin-winit = "0.3.0"
7575

deny.toml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ skip-tree = [
4646
{ name = "darling" }, # old version via tts
4747
{ name = "foreign-types" }, # old version from wgpu
4848
{ name = "rfd" }, # example dependency
49-
{ name = "three-d" }, # example dependency
5049
]
5150

5251

examples/custom_3d_glow/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ eframe = { path = "../../crates/eframe", features = [
1313
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
1414
] }
1515
egui_glow = { path = "../../crates/egui_glow" }
16-
glow = "0.11"
16+
glow = "0.12"

examples/custom_3d_three-d/Cargo.toml

-24
This file was deleted.

examples/custom_3d_three-d/README.md

-22
This file was deleted.

examples/custom_3d_three-d/index.html

-38
This file was deleted.
-51.7 KB
Binary file not shown.

examples/custom_3d_three-d/src/lib.rs

-21
This file was deleted.

0 commit comments

Comments
 (0)