aboutsummaryrefslogtreecommitdiffstats
path: root/src/x11
diff options
context:
space:
mode:
authorGlenn Watson <gw@intuitionlibrary.com>2015-01-22 12:02:02 +1000
committerGlenn Watson <gw@intuitionlibrary.com>2015-01-22 12:07:31 +1000
commit19475f8521c6ce92a9b8b2c22e13613e718b2a9e (patch)
treeb780585f561853e01ed7747aab7ec0f4157567b6 /src/x11
parent862baf82204c373d17e2878871826a457529a03f (diff)
downloadglutin-19475f8521c6ce92a9b8b2c22e13613e718b2a9e.tar.gz
glutin-19475f8521c6ce92a9b8b2c22e13613e718b2a9e.zip
Some GPU/driver combinations have glxCreateContextAttribsARB present, but it fails with an X error. In this case, catch the X error and fall back to the old method of creating a context.
Diffstat (limited to 'src/x11')
-rw-r--r--src/x11/ffi.rs12
-rw-r--r--src/x11/window/mod.rs16
2 files changed, 26 insertions, 2 deletions
diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs
index 5e7b5a1..1d9e7de 100644
--- a/src/x11/ffi.rs
+++ b/src/x11/ffi.rs
@@ -1358,6 +1358,17 @@ pub struct XF86VidModeModeInfo {
private: libc::c_long,
}
+#[repr(C)]
+pub struct XErrorEvent {
+ pub type_: libc::c_int,
+ pub display: *mut Display,
+ pub serial: libc::c_ulong,
+ pub error_code: libc::c_char,
+ pub request_code: libc::c_char,
+ pub minor_code: libc::c_char,
+ pub resourceid: XID,
+}
+
#[cfg(feature = "headless")]
#[link(name = "OSMesa")]
extern "C" {
@@ -1430,6 +1441,7 @@ extern "C" {
pub fn XScreenOfDisplay(display: *mut Display, screen_number: libc::c_int) -> *const Screen;
pub fn XWidthOfScreen(screen: *const Screen) -> libc::c_int;
pub fn XHeightOfScreen(screen: *const Screen) -> libc::c_int;
+ pub fn XSetErrorHandler(callback: fn(display: *mut Display, event: *mut XErrorEvent) -> libc::c_int) -> libc::c_int;
pub fn XCloseIM(im: XIM) -> Status;
pub fn XOpenIM(display: *mut Display, db: XrmDatabase, res_name: *mut libc::c_char,
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index 91d7e07..1457c63 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -16,10 +16,18 @@ mod monitor;
static THREAD_INIT: Once = ONCE_INIT;
+fn x_error_callback(_: *mut ffi::Display, event: *mut ffi::XErrorEvent) -> libc::c_int {
+ unsafe {
+ println!("x error code={} major={} minor={}!", (*event).error_code, (*event).request_code, (*event).minor_code);
+ }
+ 0
+}
+
fn ensure_thread_init() {
THREAD_INIT.call_once(|| {
unsafe {
ffi::XInitThreads();
+ ffi::XSetErrorHandler(x_error_callback);
}
});
}
@@ -322,14 +330,18 @@ impl Window {
ptr::null()
};
- let context = if extra_functions.CreateContextAttribsARB.is_loaded() {
+ let mut context = if extra_functions.CreateContextAttribsARB.is_loaded() {
extra_functions.CreateContextAttribsARB(display as *mut ffi::glx_extra::types::Display,
fb_config, share, 1, attributes.as_ptr())
} else {
- ffi::glx::CreateContext(display, &mut visual_infos, share, 1)
+ ptr::null()
};
if context.is_null() {
+ context = ffi::glx::CreateContext(display, &mut visual_infos, share, 1)
+ }
+
+ if context.is_null() {
return Err(OsError(format!("GL context creation failed")));
}