Refactoring as of 2019-07-13

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

Cargo.toml

@@ -1,12 +1,12 @@
 [workspace]
 members = [
     "glutin",
+    "glutin_lighter",
     "glutin_examples",
     "glutin_egl_sys",
     "glutin_glx_sys",
     "glutin_wgl_sys",
     "glutin_gles2_sys",
-    "glutin_emscripten_sys",
 ]
 
 [replace]

README.md

@@ -52,27 +52,6 @@ To compile the examples for android, you have to use the `cargo apk` utility.
 
 See [the `android-rs-glue` repository](https://github.com/rust-windowing/android-rs-glue) for instructions.
 
-### Emscripten with asmjs
-
-In order to use glutin with emscripten, start by compiling your code with `--target=asmjs-unknown-emscripten`.
-
-Then create an HTML document that contains this:
-
-```html
-<canvas id="canvas"></canvas>
-<script type="text/javascript">
-var Module = {
-    canvas: document.getElementById('canvas')
-};
-</script>
-<script type="text/javascript" src="target/asmjs-unknown-emscripten/debug/..." async></script>
-```
-
-*Note: adjust the `src` element of the script to point to the .js file that was produced by the compilation.*
-
-The `Module` object is the link between emscripten and the HTML page.
-See also [this documentation](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
-
 ### X11
 
 The plan is that glutin tries to dynamically link-to and use wayland if possible. If it doesn't work, it will try xlib instead. This is work-in-progress.

glutin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glutin"
-version = "0.22.0-alpha1"
+version = "0.23.0-alpha1"
 authors = ["The glutin contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform OpenGL context provider."
 keywords = ["windowing", "opengl"]
@@ -27,9 +27,6 @@ android_glue = "0.2"
 glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
 parking_lot = "0.8"
 
-[target.'cfg(target_os = "emscripten")'.dependencies]
-glutin_emscripten_sys = { version = "0.1.0", path = "../glutin_emscripten_sys" }
-
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
 objc = "0.2.6"
 glutin_gles2_sys = { version = "0.1.3", path = "../glutin_gles2_sys" }

glutin/src/api/mod.rs glutin/src/api.rs

@@ -8,13 +8,13 @@ use crate::{
     Api, ContextError, GlAttributes, PixelFormat, PixelFormatRequirements,
 };
 
-use winit::window::WindowBuilder;
-use winit::event_loop::EventLoopWindowTarget;
 use crate::platform::android::EventLoopExtAndroid;
 use glutin_egl_sys as ffi;
 use parking_lot::Mutex;
 use winit;
 use winit::dpi;
+use winit::event_loop::EventLoopWindowTarget;
+use winit::window::WindowBuilder;
 
 use std::sync::Arc;
 

glutin/src/api/android/mod.rs glutin/src/api/android.rs

@@ -156,8 +156,8 @@ fn get_egl_version(
 ) -> Result<(ffi::egl::types::EGLint, ffi::egl::types::EGLint), CreationError> {
     unsafe {
         let egl = EGL.as_ref().unwrap();
-        let mut major: ffi::egl::types::EGLint = std::mem::uninitialized();
-        let mut minor: ffi::egl::types::EGLint = std::mem::uninitialized();
+        let mut major: ffi::egl::types::EGLint = 0;
+        let mut minor: ffi::egl::types::EGLint = 0;
 
         if egl.Initialize(display, &mut major, &mut minor) == 0 {
             return Err(CreationError::OsError(
@@ -624,6 +624,11 @@ impl Context {
         unsafe { egl.GetCurrentContext() == self.context }
     }
 
+    #[inline]
+    pub fn get_pixel_format(&self) -> PixelFormat {
+        self.pixel_format.clone()
+    }
+
     #[inline]
     pub fn get_api(&self) -> Api {
         self.api
@@ -826,7 +831,7 @@ pub fn get_native_visual_id(
     config_id: ffi::egl::types::EGLConfig,
 ) -> ffi::egl::types::EGLint {
     let egl = EGL.as_ref().unwrap();
-    let mut value = unsafe { std::mem::uninitialized() };
+    let mut value = 0;
     let ret = unsafe {
         egl.GetConfigAttrib(
             display,
@@ -1172,7 +1177,7 @@ where
     };
 
     // calling `eglChooseConfig`
-    let mut num_configs = std::mem::uninitialized();
+    let mut num_configs = 0;
     if egl.ChooseConfig(
         display,
         descriptor.as_ptr(),
@@ -1215,7 +1220,7 @@ where
     // analyzing each config
     macro_rules! attrib {
         ($egl:expr, $display:expr, $config:expr, $attr:expr) => {{
-            let mut value = std::mem::uninitialized();
+            let mut value = 0;
             let res = $egl.GetConfigAttrib(
                 $display,
                 $config,

glutin/src/api/egl/mod.rs glutin/src/api/egl.rs

@@ -425,7 +425,7 @@ impl<'a> ContextPrototype<'a> {
                     );
                 }
 
-                let mut swap = unsafe { std::mem::uninitialized() };
+                let mut swap = 0;
                 unsafe {
                     glx.QueryDrawable(
                         self.xconn.display as *mut _,

glutin/src/api/glx/mod.rs glutin/src/api/glx.rs

@@ -70,8 +70,8 @@ use glutin_gles2_sys as ffi;
 use objc::declare::ClassDecl;
 use objc::runtime::{Class, Object, Sel, BOOL, NO, YES};
 use winit::dpi;
-use winit::window::WindowBuilder;
 use winit::event_loop::EventLoopWindowTarget;
+use winit::window::WindowBuilder;
 
 use std::ffi::CString;
 use std::os::raw;

glutin/src/api/ios/mod.rs glutin/src/api/ios.rs

@@ -20,15 +20,18 @@ use winit::dpi;
 
 use std::ffi::CString;
 use std::os::raw;
+use std::mem::MaybeUninit;
 
 #[derive(Debug)]
 pub struct OsMesaContext {
     context: osmesa_sys::OSMesaContext,
 }
 
-#[derive(Debug)]
+#[derive(Derivative)]
+#[derivative(Debug)]
 pub struct OsMesaBuffer {
-    buffer: Vec<u32>,
+    #[derivative(Debug = "ignore")]
+    buffer: Vec<MaybeUninit<u8>>,
     width: u32,
     height: u32,
 }
@@ -161,7 +164,7 @@ impl OsMesaContext {
         let ret = osmesa_sys::OSMesaMakeCurrent(
             self.context,
             buffer.buffer.as_ptr() as *mut _,
-            0x1401,
+            0x1401, // GL_UNSIGNED_BYTE
             buffer.width as raw::c_int,
             buffer.height as raw::c_int,
         );
@@ -255,8 +258,8 @@ impl OsMesaBuffer {
         Ok(OsMesaBuffer {
             width: size.0,
             height: size.1,
-            buffer: std::iter::repeat(unsafe { std::mem::uninitialized() })
-                .take((size.0 * size.1) as usize)
+            buffer: std::iter::repeat(MaybeUninit::uninit())
+                .take(size.0 as usize * size.1 as usize * 4)
                 .collect(),
         })
     }

glutin/src/api/osmesa/mod.rs glutin/src/api/osmesa.rs

@@ -708,18 +708,14 @@ unsafe fn choose_arb_pixel_format_id(
             .find(|&i| i == "WGL_ARB_framebuffer_sRGB")
             .is_some()
         {
-            out.push(
-                gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_ARB as raw::c_int,
-            );
+            out.push(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_ARB as raw::c_int);
             out.push(pf_reqs.srgb as raw::c_int);
         } else if extensions
             .split(' ')
             .find(|&i| i == "WGL_EXT_framebuffer_sRGB")
             .is_some()
         {
-            out.push(
-                gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_EXT as raw::c_int,
-            );
+            out.push(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_EXT as raw::c_int);
             out.push(pf_reqs.srgb as raw::c_int);
         } else if pf_reqs.srgb {
             return Err(());
@@ -749,8 +745,8 @@ unsafe fn choose_arb_pixel_format_id(
         out
     };
 
-    let mut format_id = std::mem::uninitialized();
-    let mut num_formats = std::mem::uninitialized();
+    let mut format_id = 0;
+    let mut num_formats = 0;
     if extra.ChoosePixelFormatARB(
         hdc as *const _,
         descriptor.as_ptr(),
@@ -777,7 +773,7 @@ unsafe fn choose_arb_pixel_format(
     format_id: raw::c_int,
 ) -> Result<PixelFormat, ()> {
     let get_info = |attrib: u32| {
-        let mut value = std::mem::uninitialized();
+        let mut value = 0;
         extra.GetPixelFormatAttribivARB(
             hdc as *const _,
             format_id as raw::c_int,