diff --git a/Cargo.lock b/Cargo.lock index dae3495..f0974ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.19.0" -source = "git+https://github.com/iceiix/glutin?rev=bb8ce243c8725411509b6ba359357530a26247e9#bb8ce243c8725411509b6ba359357530a26247e9" +source = "git+https://github.com/iceiix/glutin?rev=de52fba20678f3931fba3eb6700774469e48512f#de52fba20678f3931fba3eb6700774469e48512f" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1708,7 +1708,7 @@ dependencies = [ "collision 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.19.0 (git+https://github.com/iceiix/glutin?rev=bb8ce243c8725411509b6ba359357530a26247e9)", + "glutin 0.19.0 (git+https://github.com/iceiix/glutin?rev=de52fba20678f3931fba3eb6700774469e48512f)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2296,7 +2296,7 @@ dependencies = [ "checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604" "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a" "checksum gleam 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4b47f5b15742aee359c7895ab98cf2cceecc89bb4feb6f4e42f802d7899877da" -"checksum glutin 0.19.0 (git+https://github.com/iceiix/glutin?rev=bb8ce243c8725411509b6ba359357530a26247e9)" = "" +"checksum glutin 0.19.0 (git+https://github.com/iceiix/glutin?rev=de52fba20678f3931fba3eb6700774469e48512f)" = "" "checksum h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum http 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1a10e5b573b9a0146545010f50772b9e8b1dd0a256564cc4307694c68832a2f5" diff --git a/Cargo.toml b/Cargo.toml index d399c67..5e815d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ opt-level = 1 cfg-if = "0.1.2" wasm-bindgen = "0.2.33" sha-1 = "0.8.1" -glutin = { git = "https://github.com/iceiix/glutin", rev = "97797352b5242436cb82d8ecfb44242b69766e4c" } +glutin = { git = "https://github.com/iceiix/glutin", rev = "de52fba20678f3931fba3eb6700774469e48512f" } byteorder = "1.2.7" serde = "1.0.89" serde_json = "1.0.39" diff --git a/src/gl/mod.rs b/src/gl/mod.rs index efce7d1..1b2a894 100644 --- a/src/gl/mod.rs +++ b/src/gl/mod.rs @@ -22,7 +22,7 @@ use std::ptr; use std::ops::{Deref, DerefMut}; /// Inits the gl library. This should be called once a context is ready. -pub fn init(vid: & glutin::CombinedContext) { +pub fn init(vid: & glutin::WindowedContext) { gl::load_with(|s| vid.get_proc_address(s) as *const _); } diff --git a/src/main.rs b/src/main.rs index a5cf88e..328e295 100644 --- a/src/main.rs +++ b/src/main.rs @@ -215,7 +215,7 @@ pub fn main() { .with_gl(glutin::GlRequest::GlThenGles{opengl_version: (3, 2), opengles_version: (2, 0)}) .with_gl_profile(glutin::GlProfile::Core) .with_vsync(vsync); - let mut window = glutin::CombinedContext::new(window_builder, context, &events_loop) + let mut window = glutin::WindowedContext::new(window_builder, context, &events_loop) .expect("Could not create glutin window."); unsafe { @@ -328,7 +328,7 @@ pub fn main() { } } -fn handle_window_event(window: &mut glutin::CombinedContext, +fn handle_window_event(window: &mut glutin::WindowedContext, game: &mut Game, ui_container: &mut ui::Container, event: glutin::Event) {