Merge pull request #121 from tomaka/get-api

Add get_api() function
This commit is contained in:
tomaka 2014-12-07 14:14:10 +01:00
commit 6c5cca9d6a
6 changed files with 52 additions and 0 deletions

View file

@ -265,6 +265,10 @@ impl Window {
pub fn platform_display(&self) -> *mut libc::c_void {
self.display as *mut libc::c_void
}
pub fn get_api(&self) -> ::Api {
::Api::OpenGlEs
}
}
#[unsafe_destructor]

View file

@ -84,6 +84,14 @@ impl std::error::Error for CreationError {
}
}
/// All APIs related to OpenGL that you can possibly get while using glutin.
pub enum Api {
/// The classical OpenGL. Available on Windows, Linux, OS/X.
OpenGl,
/// OpenGL embedded system. Available on Linux, Android.
OpenGlEs,
}
/// Object that allows you to build windows.
#[cfg(feature = "window")]
pub struct WindowBuilder<'a> {
@ -457,6 +465,15 @@ impl Window {
pub unsafe fn platform_display(&self) -> *mut libc::c_void {
self.window.platform_display()
}
/// Returns the API that is currently provided by this window.
///
/// - On Windows and OS/X, this always returns `OpenGl`.
/// - On Android, this always returns `OpenGlEs`.
/// - On Linux, it must be checked at runtime.
pub fn get_api(&self) -> Api {
self.window.get_api()
}
}
#[cfg(feature = "window")]
@ -488,6 +505,13 @@ impl HeadlessContext {
pub fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
self.context.get_proc_address(addr) as *const libc::c_void
}
/// Returns the API that is currently provided by this window.
///
/// See `Window::get_api` for more infos.
pub fn get_api(&self) -> Api {
self.context.get_api()
}
}
#[cfg(feature = "headless")]

View file

@ -400,4 +400,8 @@ impl Window {
pub fn platform_display(&self) -> *mut libc::c_void {
unimplemented!()
}
pub fn get_api(&self) -> ::Api {
::Api::OpenGl
}
}

View file

@ -41,6 +41,11 @@ impl HeadlessContext {
pub fn get_proc_address(&self, addr: &str) -> *const () {
self.0.get_proc_address(addr)
}
/// See the docs in the crate root file.
pub fn get_api(&self) -> ::Api {
::Api::OpenGl
}
}
/// The Win32 implementation of the main `Window` object.
@ -252,6 +257,11 @@ impl Window {
pub fn platform_display(&self) -> *mut libc::c_void {
unimplemented!()
}
/// See the docs in the crate root file.
pub fn get_api(&self) -> ::Api {
::Api::OpenGl
}
}
#[unsafe_destructor]

View file

@ -47,6 +47,11 @@ impl HeadlessContext {
})
}
}
/// See the docs in the crate root file.
pub fn get_api(&self) -> ::Api {
::Api::OpenGl
}
}
impl Drop for HeadlessContext {

View file

@ -535,6 +535,11 @@ impl Window {
pub fn platform_display(&self) -> *mut libc::c_void {
self.display as *mut libc::c_void
}
/// See the docs in the crate root file.
pub fn get_api(&self) -> ::Api {
::Api::OpenGl
}
}
impl Drop for Window {