Skip to content
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.

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

Update glow to 0.12 #2695

Merged
merged 4 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
111 changes: 4 additions & 107 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
document-features = { version = "0.2", optional = true }

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

Expand Down
1 change: 1 addition & 0 deletions crates/egui_glow/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to the `egui_glow` integration will be noted in this file.

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


## 0.20.1 - 2022-12-11
Expand Down
4 changes: 2 additions & 2 deletions crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ egui = { version = "0.20.0", path = "../egui", default-features = false, feature
] }

bytemuck = "1.7"
glow = "0.11"
glow = "0.12"
memoffset = "0.6"
tracing = { version = "0.1", default-features = false, features = ["std"] }

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


[dev-dependencies]
glutin = "0.30" # examples/pure_glow
glutin = "0.30" # examples/pure_glow
raw-window-handle = "0.5.0"
glutin-winit = "0.3.0"

Expand Down
1 change: 0 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ skip-tree = [
{ name = "darling" }, # old version via tts
{ name = "foreign-types" }, # old version from wgpu
{ name = "rfd" }, # example dependency
{ name = "three-d" }, # example dependency
]


Expand Down
2 changes: 1 addition & 1 deletion examples/custom_3d_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ eframe = { path = "../../crates/eframe", features = [
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
egui_glow = { path = "../../crates/egui_glow" }
glow = "0.11"
glow = "0.12"
24 changes: 0 additions & 24 deletions examples/custom_3d_three-d/Cargo.toml

This file was deleted.

22 changes: 0 additions & 22 deletions examples/custom_3d_three-d/README.md

This file was deleted.

38 changes: 0 additions & 38 deletions examples/custom_3d_three-d/index.html

This file was deleted.

Binary file removed examples/custom_3d_three-d/screenshot.png
Binary file not shown.
21 changes: 0 additions & 21 deletions examples/custom_3d_three-d/src/lib.rs

This file was deleted.

Loading