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

Merge pull request #486 from tomaka/context-error

Browse source 
Handle errors from MakeCurrent and SwapBuffers
This commit is contained in:
tomaka 2015-06-17 07:36:00 +02:00
commit 90b28c2052
20 changed files with 123 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/api/glx/mod.rs
View file

@ -1,6 +1,7 @@
#![cfg(all(target_os = "linux", feature = "window"))]
use BuilderAttribs;
use ContextError;
use CreationError;
use GlContext;
use GlProfile;
@ -139,11 +140,13 @@ impl Context {
}
impl GlContext for Context {
unsafe fn make_current(&self) {
unsafe fn make_current(&self) -> Result<(), ContextError> {
// TODO: glutin needs some internal changes for proper error recovery
let res = self.glx.MakeCurrent(self.display as *mut _, self.window, self.context);
if res == 0 {
panic!("glx::MakeCurrent failed");
}
Ok(())
}
fn is_current(&self) -> bool {
@ -158,10 +161,10 @@ impl GlContext for Context {
}
}
fn swap_buffers(&self) {
unsafe {
self.glx.SwapBuffers(self.display as *mut _, self.window)
}
fn swap_buffers(&self) -> Result<(), ContextError> {
// TODO: glutin needs some internal changes for proper error recovery
unsafe { self.glx.SwapBuffers(self.display as *mut _, self.window); }
Ok(())
}
fn get_api(&self) -> ::Api {