From 53b9d6398c5e88ce5ab67be06837ee0f285e516f Mon Sep 17 00:00:00 2001
From: Tomaka17 <pierre.krieger1708@gmail.com>
Date: Tue, 12 Aug 2014 09:42:48 +0200
Subject: Remove dummy context creation for X11

---
 src/x11/mod.rs | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

(limited to 'src/x11')

diff --git a/src/x11/mod.rs b/src/x11/mod.rs
index e7a064d..3286b99 100644
--- a/src/x11/mod.rs
+++ b/src/x11/mod.rs
@@ -141,39 +141,19 @@ impl Window {
 
         // getting the pointer to glXCreateContextAttribs
         let create_context_attribs = unsafe {
-            // creating the dummy context
-            let dummy_context =
-                ffi::glXCreateContext(display, &visual_infos, ptr::null(), 1);
-            if dummy_context.is_null() {
-                return Err(format!("glXCreateContext failed"));
-            }
-
-            if ffi::glXMakeCurrent(display, window, dummy_context) == 0 {
-                return Err(format!("glXMakeCurrent with dummy context failed"));
-            }
+            let mut addr = ffi::glXGetProcAddress(b"glXCreateContextAttribs".as_ptr()
+                as *const u8) as *const ();
 
-            // getting the pointer
-            let fn_ptr = {
-                let mut addr = ffi::glXGetProcAddress(b"glXCreateContextAttribs".as_ptr()
+            if addr.is_null() {
+                addr = ffi::glXGetProcAddress(b"glXCreateContextAttribsARB".as_ptr()
                     as *const u8) as *const ();
-
-                if addr.is_null() {
-                    addr = 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
+            }
+            
+            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
+            })
         };
 
         // creating IM
-- 
cgit v1.2.3