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
emilk · Feb 8, 2023 · 636a39c · 636a39c
1 parent be9b5a3
commit 636a39c
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 448 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
@@ -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"] }
 

diff --git a/crates/egui_glow/CHANGELOG.md b/crates/egui_glow/CHANGELOG.md
@@ -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

diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml
@@ -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"] }
 
@@ -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"
 

diff --git a/deny.toml b/deny.toml
@@ -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
 ]
 
 

diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml
@@ -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"
diff --git a/examples/custom_3d_three-d/Cargo.toml b/examples/custom_3d_three-d/Cargo.toml
diff --git a/examples/custom_3d_three-d/README.md b/examples/custom_3d_three-d/README.md
diff --git a/examples/custom_3d_three-d/index.html b/examples/custom_3d_three-d/index.html
diff --git a/examples/custom_3d_three-d/screenshot.png b/examples/custom_3d_three-d/screenshot.png
diff --git a/examples/custom_3d_three-d/src/lib.rs b/examples/custom_3d_three-d/src/lib.rs