From d3e3590b84502c0d18228d40d2676cea2247bd02 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 7 Aug 2014 18:03:56 +0200 Subject: Fix glXCreateContextAttrib always null --- src/x11/mod.rs | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'src/x11') diff --git a/src/x11/mod.rs b/src/x11/mod.rs index d2619c9..9103ea2 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -141,19 +141,33 @@ impl Window { // getting the pointer to glXCreateContextAttribs let create_context_attribs = unsafe { - let mut addr = unsafe { ffi::glXGetProcAddress(b"glXCreateContextAttribs".as_ptr() - as *const u8) } as *const (); - - if addr.is_null() { - addr = unsafe { ffi::glXGetProcAddress(b"glXCreateContextAttribsARB".as_ptr() + // creating the dummy context + let dummy_context = + ffi::glXCreateContext(display, &visual_infos, ptr::null(), 1); + ffi::glXMakeCurrent(display, window, dummy_context); + + // getting the pointer + let fn_ptr = { + let mut addr = unsafe { ffi::glXGetProcAddress(b"glXCreateContextAttribs".as_ptr() as *const u8) } as *const (); - } - - addr.to_option().map(|addr| { - let addr: extern "system" fn(*mut ffi::Display, ffi::GLXFBConfig, ffi::GLXContext, - ffi::Bool, *const libc::c_int) -> ffi::GLXContext = unsafe { mem::transmute(addr) }; - addr - }) + + if addr.is_null() { + addr = unsafe { ffi::glXGetProcAddress(b"glXCreateContextAttribsARB".as_ptr() + as *const u8) } as *const (); + } + + addr.to_option().map(|addr| { + let addr: extern "system" fn(*mut ffi::Display, ffi::GLXFBConfig, ffi::GLXContext, + ffi::Bool, *const libc::c_int) -> ffi::GLXContext = mem::transmute(addr); + addr + }) + }; + + // cleaning up + ffi::glXMakeCurrent(ptr::mut_null(), 0, ptr::null()); + ffi::glXDestroyContext(display, dummy_context); + + fn_ptr }; // creating IM -- cgit v1.2.3