janitor: Update glow dependency

This commit is contained in:
Simon Hausmann 2023-01-24 09:35:18 +01:00
parent 8a56d7a272
commit d5ca021485
3 changed files with 4 additions and 7 deletions

View file

@ -17,7 +17,7 @@ name = "opengl_underlay"
[dependencies] [dependencies]
slint = { path = "../../api/rs/slint" } slint = { path = "../../api/rs/slint" }
# Use a git version until https://github.com/grovesNL/glow/issues/210 is released to crates.io # Use a git version until https://github.com/grovesNL/glow/issues/210 is released to crates.io
glow = { version = "0.11", git = "https://github.com/grovesNL/glow", rev = "11853d28ae64fbd7db5c856fe8b92a4a20fded94" } glow = { version = "0.12" }
instant = { version = "0.1", features = [ "now" ] } instant = { version = "0.1", features = [ "now" ] }
[build-dependencies] [build-dependencies]

View file

@ -42,7 +42,7 @@ instant = "0.1"
raw-window-handle = { version = "0.5", features = ["alloc"] } raw-window-handle = { version = "0.5", features = ["alloc"] }
skia-safe = { version = "0.58", features = ["textlayout"] } skia-safe = { version = "0.58", features = ["textlayout"] }
glow = { version = "0.11" } glow = { version = "0.12" }
unicode-segmentation = { version = "1.8.0" } unicode-segmentation = { version = "1.8.0" }
glutin = { version = "0.30", default-features = false, features = ["egl", "wgl"] } glutin = { version = "0.30", default-features = false, features = ["egl", "wgl"] }

View file

@ -35,11 +35,8 @@ impl super::Surface for OpenGLSurface {
use glow::HasContext; use glow::HasContext;
let gl = unsafe { let gl = unsafe {
glow::Context::from_loader_function(|name| { glow::Context::from_loader_function_cstr(|name| {
current_glutin_context current_glutin_context.display().get_proc_address(name) as *const _
.display()
.get_proc_address(&std::ffi::CString::new(name).unwrap())
as *const _
}) })
}; };
let fboid = unsafe { gl.get_parameter_i32(glow::FRAMEBUFFER_BINDING) }; let fboid = unsafe { gl.get_parameter_i32(glow::FRAMEBUFFER_BINDING) };