Merge pull request #409 from kvark/core

GL core profile flag

3 files changed, 45 insertions, 17 deletions

diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index 7114a87..a58001d 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -9,7 +9,9 @@ use libc;
 
 use Api;
 use BuilderAttribs;
+use CreationError;
 use GlContext;
+use GlProfile;
 use GlRequest;
 use PixelFormat;
 use native_monitor::NativeMonitorId;
@@ -334,7 +336,6 @@ impl Window {
             Some(window) => window,
             None         => { return Err(OsError(format!("Couldn't create NSWindow"))); },
         };
-
         let view = match Window::create_view(*window) {
             Some(view) => view,
             None       => { return Err(OsError(format!("Couldn't create NSView"))); },
@@ -469,18 +470,17 @@ impl Window {
         }
     }
 
-    fn create_context(view: id, builder: &BuilderAttribs) -> (Option<IdRef>, Option<PixelFormat>) {
-        let profile = match builder.gl_version {
-            GlRequest::Latest => NSOpenGLProfileVersion4_1Core as u32,
-            GlRequest::Specific(Api::OpenGl, (1 ... 2, _)) => NSOpenGLProfileVersionLegacy as u32,
-            GlRequest::Specific(Api::OpenGl, (3, 0)) => NSOpenGLProfileVersionLegacy as u32,
-            GlRequest::Specific(Api::OpenGl, (3, 1 ... 2)) => NSOpenGLProfileVersion3_2Core as u32,
-            GlRequest::Specific(Api::OpenGl, _) => NSOpenGLProfileVersion4_1Core as u32,
-            GlRequest::Specific(_, _) => panic!("Only the OpenGL API is supported"),    // FIXME: return Result
-            GlRequest::GlThenGles { opengl_version: (1 ... 2, _), .. } => NSOpenGLProfileVersionLegacy as u32,
-            GlRequest::GlThenGles { opengl_version: (3, 0), .. } => NSOpenGLProfileVersionLegacy as u32,
-            GlRequest::GlThenGles { opengl_version: (3, 1 ... 2), .. } => NSOpenGLProfileVersion3_2Core as u32,
-            GlRequest::GlThenGles { .. } => NSOpenGLProfileVersion4_1Core as u32,
+    fn create_context(view: id, builder: &BuilderAttribs) -> Result<(Option<IdRef>, Option<PixelFormat>), CreationError> {
+        let profile = match (builder.gl_version, builder.gl_version.to_gl_version(), builder.gl_profile) {
+            (GlRequest::Latest, _, Some(GlProfile::Compatibility)) => NSOpenGLProfileVersionLegacy as u32,
+            (GlRequest::Latest, _, _) => NSOpenGLProfileVersion4_1Core as u32,
+            (_, Some(1 ... 2, _), Some(GlProfile::Core)) |
+            (_, Some(3 ... 4, _), Some(GlProfile::Compatibility)) =>
+                return Err(CreationError::NotSupported),
+            (_, Some(1 ... 2, _), _) => NSOpenGLProfileVersionLegacy as u32,
+            (_, Some(3, 0 ... 2), _) => NSOpenGLProfileVersion3_2Core as u32,
+            (_, Some(3 ... 4, _), _) => NSOpenGLProfileVersion4_1Core as u32,
+            _ => return Err(CreationError::NotSupported),
         };
 
         // NOTE: OS X no longer has the concept of setting individual
@@ -517,7 +517,7 @@ impl Window {
         // attribute list must be null terminated.
         attributes.push(0);
 
-        unsafe {
+        Ok(unsafe {
             let pixelformat = IdRef::new(NSOpenGLPixelFormat::alloc(nil).initWithAttributes_(&attributes));
 
             if let Some(pixelformat) = pixelformat.non_nil() {
@@ -575,7 +575,7 @@ impl Window {
             } else {
                 (None, None)
             }
-        }
+        })
     }
 
     pub fn is_closed(&self) -> bool {
diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs
index 7aa77e7..cb61dfa 100644
--- a/src/api/glx/mod.rs
+++ b/src/api/glx/mod.rs
@@ -3,6 +3,7 @@
 use BuilderAttribs;
 use CreationError;
 use GlContext;
+use GlProfile;
 use GlRequest;
 use Api;
 use PixelFormat;
@@ -52,6 +53,17 @@ impl Context {
                 },
             }
 
+            if let Some(profile) = builder.gl_profile {
+                let flag = match profile {
+                    GlProfile::Compatibility =>
+                        ffi::glx_extra::CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+                    GlProfile::Core =>
+                        ffi::glx_extra::CONTEXT_CORE_PROFILE_BIT_ARB,
+                };
+                attributes.push(ffi::glx_extra::CONTEXT_PROFILE_MASK_ARB as libc::c_int);
+                attributes.push(flag as libc::c_int);
+            }
+
             if builder.gl_debug {
                 attributes.push(ffi::glx_extra::CONTEXT_FLAGS_ARB as libc::c_int);
                 attributes.push(ffi::glx_extra::CONTEXT_DEBUG_BIT_ARB as libc::c_int);
@@ -184,8 +196,6 @@ unsafe impl Sync for Context {}
 
 impl Drop for Context {
     fn drop(&mut self) {
-        use std::ptr;
-
         unsafe {
             // we don't call MakeCurrent(0, 0) because we are not sure that the context
             // is still the current one
diff --git a/src/api/win32/init.rs b/src/api/win32/init.rs
index 39b9d97..e5b0b3a 100644
--- a/src/api/win32/init.rs
+++ b/src/api/win32/init.rs
@@ -17,6 +17,7 @@ use BuilderAttribs;
 use CreationError;
 use CreationError::OsError;
 use CursorState;
+use GlProfile;
 use GlRequest;
 use PixelFormat;
 
@@ -374,6 +375,23 @@ unsafe fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'st
                 },
             }
 
+            if let Some(profile) = builder.gl_profile {
+                if is_extension_supported(extra_functions, hdc,
+                                          "WGL_ARB_create_context_profile")
+                {
+                    let flag = match profile {
+                        GlProfile::Compatibility =>
+                            gl::wgl_extra::CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+                        GlProfile::Core =>
+                            gl::wgl_extra::CONTEXT_CORE_PROFILE_BIT_ARB,
+                    };
+                    attributes.push(gl::wgl_extra::CONTEXT_PROFILE_MASK_ARB as libc::c_int);
+                    attributes.push(flag as libc::c_int);
+                } else {
+                    return Err(CreationError::NotSupported);
+                }
+            }
+
             if builder.gl_debug {
                 attributes.push(gl::wgl_extra::CONTEXT_FLAGS_ARB as libc::c_int);
                 attributes.push(gl::wgl_extra::CONTEXT_DEBUG_BIT_ARB as libc::c_int);