leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the "headless" feature

Browse source
This commit is contained in:
Pierre Krieger 2015-05-04 07:32:02 +02:00
parent e953e3d4ea
commit ace4808fac
8 changed files with 83 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/api/caca/mod.rs
View file

@ -1,7 +1,7 @@
#![cfg(all(any(target_os = "linux", target_os = "freebsd"), feature="headless"))]
#![cfg(any(target_os = "linux", target_os = "freebsd"))]
use libc;
use api::osmesa::OsMesaContext;
use api::osmesa::{OsMesaContext, OsMesaCreationError};
use Api;
use BuilderAttribs;
@ -83,7 +83,12 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
impl Window {
pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
let opengl = try!(OsMesaContext::new(builder));
let opengl = match OsMesaContext::new(builder) {
Err(OsMesaCreationError::NotSupported) => return Err(CreationError::NotSupported),
Err(OsMesaCreationError::CreationError(e)) => return Err(e),
Ok(c) => c
};
let opengl_dimensions = opengl.get_dimensions();
let libcaca = match ffi::LibCaca::open(&Path::new("libcaca.so.0")) {