Update to glow 0.13 (#3715)

7 files changed, 20 insertions, 30 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 6137494b..978db37b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1169,7 +1169,7 @@ dependencies = [
  "egui-wgpu",
  "egui-winit",
  "egui_glow",
- "glow 0.12.3",
+ "glow",
  "glutin",
  "glutin-winit",
  "image",
@@ -1308,7 +1308,7 @@ dependencies = [
  "document-features",
  "egui",
  "egui-winit",
- "glow 0.12.3",
+ "glow",
  "glutin",
  "glutin-winit",
  "log",
@@ -1768,18 +1768,6 @@ dependencies = [
 
 [[package]]
 name = "glow"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glow"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4"
@@ -4286,7 +4274,7 @@ dependencies = [
  "block",
  "core-graphics-types",
  "d3d12",
- "glow 0.13.0",
+ "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
diff --git a/Cargo.toml b/Cargo.toml
index 134f3244..641073f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,7 @@ opt-level = 2
 
 [workspace.dependencies]
 criterion = { version = "0.5.1", default-features = false }
+glow = "0.13"
 puffin = "0.18"
 raw-window-handle = "0.5.0"
 thiserror = "1.0.37"
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
index e9f36080..3d7d8a28 100644
--- a/crates/eframe/Cargo.toml
+++ b/crates/eframe/Cargo.toml
@@ -116,7 +116,7 @@ thiserror.workspace = true
 document-features = { version = "0.2", optional = true }
 
 egui_glow = { version = "0.24.1", path = "../egui_glow", optional = true, default-features = false }
-glow = { version = "0.12", optional = true }
+glow = { workspace = true, optional = true }
 ron = { version = "0.8", optional = true, features = ["integer128"] }
 serde = { version = "1", optional = true, features = ["derive"] }
 
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
index cc77972b..922039bf 100644
--- a/crates/eframe/src/native/glow_integration.rs
+++ b/crates/eframe/src/native/glow_integration.rs
@@ -5,6 +5,8 @@
 //! There is a bunch of improvements we could do,
 //! like removing a bunch of `unwraps`.
 
+#![allow(clippy::arc_with_non_send_sync)] // glow::Context was accidentally non-Sync in glow 0.13, but that will be fixed in future releases of glow: https://github.com/grovesNL/glow/commit/c4a5f7151b9b4bbb380faa06ec27415235d1bf7e
+
 use std::{cell::RefCell, rc::Rc, sync::Arc, time::Instant};
 
 use glutin::{
diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml
index 71005497..bd0657dd 100644
--- a/crates/egui_glow/Cargo.toml
+++ b/crates/egui_glow/Cargo.toml
@@ -49,7 +49,7 @@ egui = { version = "0.24.1", path = "../egui", default-features = false, feature
 ] }
 
 bytemuck = "1.7"
-glow = "0.12"
+glow.workspace = true
 log = { version = "0.4", features = ["std"] }
 memoffset = "0.7"
 
diff --git a/crates/egui_glow/examples/pure_glow.rs b/crates/egui_glow/examples/pure_glow.rs
index c9fbb33d..a802249a 100644
--- a/crates/egui_glow/examples/pure_glow.rs
+++ b/crates/egui_glow/examples/pure_glow.rs
@@ -2,6 +2,7 @@
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 #![allow(unsafe_code)]
+#![allow(clippy::arc_with_non_send_sync)] // glow::Context was accidentally non-Sync in glow 0.13, but that will be fixed in future releases of glow: https://github.com/grovesNL/glow/commit/c4a5f7151b9b4bbb380faa06ec27415235d1bf7e
 
 use egui_winit::winit;
 
diff --git a/deny.toml b/deny.toml
index 6882337c..5460ef4e 100644
--- a/deny.toml
+++ b/deny.toml
@@ -34,19 +34,17 @@ deny = [
 ]
 
 skip = [
-    { name = "arrayvec" },       # old version via tiny-skiaz
-    { name = "base64" },         # small crate, old version from usvg
-    { name = "bitflags" },       # old 1.0 version via glutin, png, spirv, …
-    { name = "glow" },           # TODO(@wumpf): updatere glow
-    { name = "glutin_wgl_sys" }, # TODO(@wumpf): updatere glow
-    { name = "libloading" },     # wgpu-hal itself depends on 0.8 while some of its dependencies, like ash and d3d12, depend on 0.7
-    { name = "memoffset" },      # tiny dependency
-    { name = "quick-xml" },      # old version via wayland-scanner
-    { name = "redox_syscall" },  # old version via directories-next
-    { name = "spin" },           # old version via ring through rusttls and other libraries, newer for wgpu.
-    { name = "time" },           # old version pulled in by unmaintianed crate 'chrono'
-    { name = "ttf-parser" },     # different versions pulled in by ab_glyph and usvg
-    { name = "windows" },        # old version via accesskit_windows
+    { name = "arrayvec" },      # old version via tiny-skiaz
+    { name = "base64" },        # small crate, old version from usvg
+    { name = "bitflags" },      # old 1.0 version via glutin, png, spirv, …
+    { name = "libloading" },    # wgpu-hal itself depends on 0.8 while some of its dependencies, like ash and d3d12, depend on 0.7
+    { name = "memoffset" },     # tiny dependency
+    { name = "quick-xml" },     # old version via wayland-scanner
+    { name = "redox_syscall" }, # old version via directories-next
+    { name = "spin" },          # old version via ring through rusttls and other libraries, newer for wgpu.
+    { name = "time" },          # old version pulled in by unmaintianed crate 'chrono'
+    { name = "ttf-parser" },    # different versions pulled in by ab_glyph and usvg
+    { name = "windows" },       # old version via accesskit_windows
 ]
 skip-tree = [
     { name = "criterion" },     # dev-dependency