Transparency fixes and windows build fixes.

Signed-off-by: Hal Gentz <[email protected]>
rust-windowing · Apr 28, 2019 · acf1941 · acf1941
1 parent 845e255
commit acf1941
Show file tree

Hide file tree

Showing 13 changed files with 547 additions and 216 deletions.
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
@@ -61,3 +61,4 @@ glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
 glutin_glx_sys = { version = "0.1.5", path = "../glutin_glx_sys" }
 derivative = "1.0"
 parking_lot = "0.7"
+log = "0.4"
diff --git a/glutin/src/api/android/mod.rs b/glutin/src/api/android/mod.rs
@@ -69,6 +69,7 @@ impl Context {
             &gl_attr,
             native_display,
             EglSurfaceType::Window,
+            |c, _| c[0],
         )
         .and_then(|p| p.finish(nwin as *const _))?;
         let ctx = Arc::new(AndroidContext {
@@ -115,6 +116,7 @@ impl Context {
             &gl_attr,
             NativeDisplay::Android,
             EglSurfaceType::PBuffer,
+            |c, _| c[0],
         )?;
         let egl_context = context.finish_pbuffer(size)?;
         let ctx = Arc::new(AndroidContext {

diff --git a/glutin/src/api/dlloader/mod.rs → glutin/src/api/dlloader.rs b/glutin/src/api/dlloader/mod.rs → glutin/src/api/dlloader.rs
@@ -13,7 +13,7 @@ use std::ffi::CString;
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct SymWrapper<T> {
     inner: T,
     _lib: Arc<Library>,