diff options
author | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-06-16 10:15:31 +0200 |
---|---|---|
committer | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-06-16 10:44:44 +0200 |
commit | f6c26ec593ba96d89cb3476c815d6f33a915bfdd (patch) | |
tree | cc204a0cdfed5c3431f1e26cc2da10048d8c3474 /src/api/glx | |
parent | e48c853b9c7a617bf8ba5f31b5fb2088c90c0ee7 (diff) | |
download | glutin-f6c26ec593ba96d89cb3476c815d6f33a915bfdd.tar.gz glutin-f6c26ec593ba96d89cb3476c815d6f33a915bfdd.zip |
Handle errors from MakeCurrent and SwapBuffers
Diffstat (limited to 'src/api/glx')
-rw-r--r-- | src/api/glx/mod.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs index f1eb436..4ba99ca 100644 --- a/src/api/glx/mod.rs +++ b/src/api/glx/mod.rs @@ -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 { |