Fix cocoa headless

4 files changed, 52 insertions, 51 deletions

diff --git a/build.rs b/build.rs
index bf25c95..985bb59 100644
--- a/build.rs
+++ b/build.rs
@@ -180,8 +180,8 @@ fn main() {
 
     let mut file = File::create(&dest.join("test_gl_bindings.rs")).unwrap();
     gl_generator::generate_bindings(gl_generator::StructGenerator,
-                                    gl_generator::registry::Ns::Gles2,
+                                    gl_generator::registry::Ns::Gl,
                                     gl_generator::Fallbacks::All,
                                     khronos_api::GL_XML, vec![],
-                                    "3.0", "core", &mut file).unwrap();
+                                    "3.3", "core", &mut file).unwrap();
 }
diff --git a/examples/support/mod.rs b/examples/support/mod.rs
index ebbe379..bb65e15 100644
--- a/examples/support/mod.rs
+++ b/examples/support/mod.rs
@@ -4,7 +4,6 @@ use std::ptr;
 use glutin;
 
 mod gl {
-    pub use self::Gles2 as Gl;
     include!(concat!(env!("OUT_DIR"), "/test_gl_bindings.rs"));
 }
 
diff --git a/src/api/cocoa/headless.rs b/src/api/cocoa/headless.rs
index d0d59f3..c12f016 100644
--- a/src/api/cocoa/headless.rs
+++ b/src/api/cocoa/headless.rs
@@ -14,13 +14,6 @@ use cocoa::base::{id, nil};
 use cocoa::appkit::*;
 use PixelFormat;
 
-mod gl {
-    include!(concat!(env!("OUT_DIR"), "/gl_bindings.rs"));
-}
-
-static mut framebuffer: u32 = 0;
-static mut texture: u32 = 0;
-
 pub struct HeadlessContext {
     width: u32,
     height: u32,
@@ -33,9 +26,14 @@ impl HeadlessContext {
     {
         let context = unsafe {
             let attributes = [
-                NSOpenGLPFAAccelerated as u32,
-                NSOpenGLPFAAllowOfflineRenderers as u32,
                 NSOpenGLPFADoubleBuffer as u32,
+                NSOpenGLPFAClosestPolicy as u32,
+                NSOpenGLPFAColorSize as u32, 24,
+                NSOpenGLPFAAlphaSize as u32, 8,
+                NSOpenGLPFADepthSize as u32, 24,
+                NSOpenGLPFAStencilSize as u32, 8,
+
+                NSOpenGLPFAOpenGLProfile as u32, NSOpenGLProfileVersion3_2Core as u32,
                 0
             ];
 
@@ -56,9 +54,6 @@ impl HeadlessContext {
             context: context,
         };
 
-        // Load the function pointers as we need them to create the FBO
-        gl::load_with(|s| headless.get_proc_address(s) as *const c_void);
-
         Ok(headless)
     }
 }
@@ -66,28 +61,12 @@ impl HeadlessContext {
 impl GlContext for HeadlessContext {
     unsafe fn make_current(&self) -> Result<(), ContextError> {
         self.context.makeCurrentContext();
-
-        gl::GenFramebuffersEXT(1, &mut framebuffer);
-        gl::BindFramebufferEXT(gl::FRAMEBUFFER_EXT, framebuffer);
-        gl::GenTextures(1, &mut texture);
-        gl::BindTexture(gl::TEXTURE_2D, texture);
-        gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as i32);
-        gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR as i32);
-        gl::TexImage2D(gl::TEXTURE_2D, 0, gl::RGBA8 as i32, self.width as i32, self.height as i32,
-                       0, gl::RGBA, gl::UNSIGNED_BYTE, ptr::null());
-        gl::FramebufferTexture2DEXT(gl::FRAMEBUFFER_EXT, gl::COLOR_ATTACHMENT0_EXT,
-                                    gl::TEXTURE_2D, texture, 0);
-        let status = gl::CheckFramebufferStatusEXT(gl::FRAMEBUFFER_EXT);
-        if status != gl::FRAMEBUFFER_COMPLETE_EXT {
-            panic!("Error while creating the framebuffer");
-        }
-
         Ok(())
     }
 
     #[inline]
     fn is_current(&self) -> bool {
-        unimplemented!()
+        true
     }
 
     #[inline]
@@ -105,6 +84,7 @@ impl GlContext for HeadlessContext {
 
     #[inline]
     fn swap_buffers(&self) -> Result<(), ContextError> {
+        unsafe { self.context.flushBuffer(); }
         Ok(())
     }
 
@@ -121,13 +101,3 @@ impl GlContext for HeadlessContext {
 
 unsafe impl Send for HeadlessContext {}
 unsafe impl Sync for HeadlessContext {}
-
-impl Drop for HeadlessContext {
-    #[inline]
-    fn drop(&mut self) {
-        unsafe {
-            gl::DeleteTextures(1, &texture);
-            gl::DeleteFramebuffersEXT(1, &framebuffer);
-        }
-    }
-}
diff --git a/tests/headless.rs b/tests/headless.rs
index fdbb6c2..69d06b8 100644
--- a/tests/headless.rs
+++ b/tests/headless.rs
@@ -1,28 +1,60 @@
 extern crate glutin;
 extern crate libc;
+use glutin::*;
+use std::ptr;
 
 mod gl {
     include!(concat!(env!("OUT_DIR"), "/test_gl_bindings.rs"));
 }
+use gl::types::*;
 
-#[cfg(feature = "headless")]
 #[test]
 fn main() {
-    let window = glutin::HeadlessRendererBuilder::new(1024, 768).build().unwrap();
+    let width: i32 = 2;
+    let height: i32 = 1;
+    let window = glutin::HeadlessRendererBuilder::new(width as u32, height as u32).build().unwrap();
 
     unsafe { window.make_current() };
 
-    let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol));
+    let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol) as *const _);
 
     unsafe {
+        let mut framebuffer = 0;
+        let mut texture = 0;
+        gl.GenFramebuffers(1, &mut framebuffer);
+        gl.BindFramebuffer(gl::FRAMEBUFFER, framebuffer);
+        gl.GenTextures(1, &mut texture);
+        gl.BindTexture(gl::TEXTURE_2D, texture);
+        gl.TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as i32);
+        gl.TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR as i32);
+        gl.TexImage2D(gl::TEXTURE_2D, 0, gl::RGBA as i32, width, height,
+                     0, gl::RGBA, gl::UNSIGNED_BYTE, ptr::null());
+        gl.FramebufferTexture(gl::FRAMEBUFFER, gl::COLOR_ATTACHMENT0, texture, 0);
+        let status = gl.CheckFramebufferStatus(gl::FRAMEBUFFER);
+        if status != gl::FRAMEBUFFER_COMPLETE {
+          panic!("Error while creating the framebuffer");
+        }
+
         gl.ClearColor(0.0, 1.0, 0.0, 1.0);
         gl.Clear(gl::COLOR_BUFFER_BIT);
+        gl.Enable(gl::SCISSOR_TEST);
+        gl.Scissor(1, 0, 1, 1);
+        gl.ClearColor(1.0, 0.0, 0.0, 1.0);
+        gl.Clear(gl::COLOR_BUFFER_BIT);
+
+        let mut values: Vec<u8> = vec![0;(width*height*4) as usize];
+        gl.ReadPixels(0, 0, width, height, gl::RGBA, gl::UNSIGNED_BYTE, values.as_mut_ptr() as *mut GLvoid);
+
+        println!("{:?}", values);
+
+        assert_eq!(values[0], 0);
+        assert_eq!(values[1], 255);
+        assert_eq!(values[2], 0);
+        assert_eq!(values[3], 255);
 
-        let mut value: (u8, u8, u8, u8) = std::mem::uninitialized();
-        gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, std::mem::transmute(&mut value));
-        
-        assert!(value == (0, 255, 0, 255) || value == (0, 64, 0, 255) ||
-                value == (0, 64, 0, 255) || value == (0, 64, 0, 0),
-                "value is: {:?}", value);
+        assert_eq!(values[4], 255);
+        assert_eq!(values[5], 0);
+        assert_eq!(values[6], 0);
+        assert_eq!(values[7], 255);
     }
 }