aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.toml2
-rw-r--r--build.rs1
-rw-r--r--src/api/cocoa/mod.rs29
-rw-r--r--src/api/glx/mod.rs12
-rw-r--r--src/api/win32/init.rs16
-rw-r--r--src/lib.rs19
-rw-r--r--src/window.rs12
7 files changed, 70 insertions, 21 deletions
diff --git a/Cargo.toml b/Cargo.toml
index f059bad..aa41709 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "glutin"
-version = "0.0.27"
+version = "0.0.28"
authors = ["tomaka <pierre.krieger1708@gmail.com>"]
description = "Cross-plaform OpenGL context provider."
keywords = ["windowing", "opengl"]
diff --git a/build.rs b/build.rs
index 4f96710..3f5fcbe 100644
--- a/build.rs
+++ b/build.rs
@@ -52,6 +52,7 @@ fn main() {
khronos_api::GLX_XML,
vec![
"GLX_ARB_create_context".to_string(),
+ "GLX_ARB_create_context_profile".to_string(),
"GLX_ARB_framebuffer_sRGB".to_string(),
"GLX_EXT_framebuffer_sRGB".to_string(),
"GLX_EXT_swap_control".to_string(),
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index 7114a87..bbc110d 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -9,6 +9,7 @@ use libc;
use Api;
use BuilderAttribs;
+use CreationError;
use GlContext;
use GlRequest;
use PixelFormat;
@@ -334,7 +335,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 +469,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_core) {
+ (GlRequest::Latest, _, Some(false)) => NSOpenGLProfileVersionLegacy as u32,
+ (GlRequest::Latest, _, _) => NSOpenGLProfileVersion4_1Core as u32,
+ (_, Some(1 ... 2, _), Some(true)) |
+ (_, Some(3 ... 4, _), Some(false)) =>
+ 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 +516,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 +574,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..b0efc37 100644
--- a/src/api/glx/mod.rs
+++ b/src/api/glx/mod.rs
@@ -52,6 +52,16 @@ impl Context {
},
}
+ if let Some(core) = builder.gl_core {
+ attributes.push(ffi::glx_extra::CONTEXT_PROFILE_MASK_ARB as libc::c_int);
+ attributes.push(if core {
+ ffi::glx_extra::CONTEXT_CORE_PROFILE_BIT_ARB
+ } else {
+ ffi::glx_extra::CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB
+ } 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 +194,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..3837069 100644
--- a/src/api/win32/init.rs
+++ b/src/api/win32/init.rs
@@ -374,6 +374,22 @@ unsafe fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'st
},
}
+ if let Some(core) = builder.gl_core {
+ if is_extension_supported(extra_functions, hdc,
+ "WGL_ARB_create_context_profile")
+ {
+ attributes.push(gl::wgl_extra::CONTEXT_PROFILE_MASK_ARB as libc::c_int);
+ attributes.push(if core {
+ gl::wgl_extra::CONTEXT_CORE_PROFILE_BIT_ARB
+ } else {
+ gl::wgl_extra::CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB
+ } 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);
diff --git a/src/lib.rs b/src/lib.rs
index be66099..713efef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -161,6 +161,22 @@ pub enum GlRequest {
},
}
+impl GlRequest {
+ /// Extract the desktop GL version, if any.
+ pub fn to_gl_version(&self) -> Option<(u8, u8)> {
+ match self {
+ &GlRequest::Specific(Api::OpenGl, version) => Some(version),
+ &GlRequest::GlThenGles { opengl_version: version, .. } => Some(version),
+ _ => None,
+ }
+ }
+}
+
+/// The minimum core profile GL context. Useful for getting the minimum
+/// required GL version while still running on OSX, which often forbids
+/// the compatibility profile features.
+pub static GL_CORE: GlRequest = GlRequest::Specific(Api::OpenGl, (3, 2));
+
#[derive(Debug, Copy, Clone)]
pub enum MouseCursor {
/// The platform-dependent default cursor.
@@ -261,6 +277,7 @@ pub struct BuilderAttribs<'a> {
title: String,
monitor: Option<platform::MonitorID>,
gl_version: GlRequest,
+ gl_core: Option<bool>,
gl_debug: bool,
vsync: bool,
visible: bool,
@@ -283,6 +300,7 @@ impl BuilderAttribs<'static> {
title: "glutin window".to_string(),
monitor: None,
gl_version: GlRequest::Latest,
+ gl_core: None,
gl_debug: cfg!(debug_assertions),
vsync: false,
visible: true,
@@ -309,6 +327,7 @@ impl<'a> BuilderAttribs<'a> {
title: self.title,
monitor: self.monitor,
gl_version: self.gl_version,
+ gl_core: self.gl_core,
gl_debug: self.gl_debug,
vsync: self.vsync,
visible: self.visible,
diff --git a/src/window.rs b/src/window.rs
index 7508f32..8898e1e 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -67,6 +67,12 @@ impl<'a> WindowBuilder<'a> {
self
}
+ /// Sets the Core/Compatibility flag of the created OpenGL context.
+ pub fn with_gl_core_profile(mut self, core: bool) -> WindowBuilder<'a> {
+ self.attribs.gl_core = Some(core);
+ self
+ }
+
/// Sets the *debug* flag for the OpenGL context.
///
/// The default value for this flag is `cfg!(debug_assertions)`, which means that it's enabled
@@ -124,9 +130,9 @@ impl<'a> WindowBuilder<'a> {
self
}
- /// Sets whether sRGB should be enabled on the window. `None` means "I don't care".
- pub fn with_srgb(mut self, srgb_enabled: Option<bool>) -> WindowBuilder<'a> {
- self.attribs.srgb = srgb_enabled;
+ /// Sets whether sRGB should be enabled on the window.
+ pub fn with_srgb(mut self, srgb: bool) -> WindowBuilder<'a> {
+ self.attribs.srgb = Some(srgb);
self
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 16:55:20 +0000