Remove unneeded wglMakeCurrent & minor fixes

Author: MortimerGoro

src/platform/with_wgl/native_gl_context.rs

@@ -113,13 +113,11 @@ impl NativeGLContextMethods for NativeGLContext {
         };
         match unsafe { utils::create_offscreen(render_ctx, &WGLAttributes::default()) } {
             Ok(ref res) => {
-
                 let ctx = NativeGLContext {
                     render_ctx: res.0,
                     device_ctx: res.1,
                     weak: false,
                 };
-                ctx.make_current().unwrap();
                 Ok(ctx)
             }
             Err(s) => {
@@ -160,15 +158,15 @@ impl NativeGLContextMethods for NativeGLContext {
             if wgl::MakeCurrent(self.device_ctx as *const _, self.render_ctx as *const _) != 0 {
                 Ok(())
             } else {
-                Err("wgl::makeCurrent failed")
+                Err("WGL::makeCurrent failed")
             }
         }
     }
 
     fn unbind(&self) -> Result<(), &'static str> {
         unsafe {
             if self.is_current() && wgl::MakeCurrent(ptr::null_mut(), ptr::null_mut()) == 0 {
-                Err("gwl::MakeCurrent (on unbind)")
+                Err("WGL::MakeCurrent (on unbind)")
             } else {
                 Ok(())
             }

src/platform/with_wgl/utils.rs

@@ -88,13 +88,14 @@ unsafe fn create_full_context(settings: &WGLAttributes,
                               hdc: winapi::HDC,
                               share: winapi::HGLRC)
                               -> Result<(winapi::HGLRC, winapi::HDC), String> {
-    if extensions.split(' ').find(|&i| i == "WGL_ARB_create_context").is_none() {
+    let mut extensions = extensions.split(' ');
+    if extensions.find(|&i| i == "WGL_ARB_create_context").is_none() {
         return create_basic_context(hdc, share);
     }
 
     let mut attributes = Vec::new();
     if settings.opengl_es {
-        if extensions.split(' ').find(|&i| i == "WGL_EXT_create_context_es2_profile").is_some() {
+        if extensions.find(|&i| i == "WGL_EXT_create_context_es2_profile").is_some() {
             attributes.push(wgl_ext::CONTEXT_PROFILE_MASK_ARB as c_int);
             attributes.push(wgl_ext::CONTEXT_ES2_PROFILE_BIT_EXT as c_int);
         } else {
@@ -127,9 +128,11 @@ unsafe fn create_full_context(settings: &WGLAttributes,
                            io::Error::last_os_error()));
     }
 
+    if wgl::MakeCurrent(hdc as *const _, ctx as *const _) == 0  {
+        return Err("wglMakeCurrent failed".to_owned());
+    }
     // Disable or enable vsync
-    if extensions.split(' ').find(|&i| i == "WGL_EXT_swap_control").is_some() {
-        let _guard = try!(CurrentContextGuard::make_current(hdc, ctx as winapi::HGLRC));
+    if extensions.find(|&i| i == "WGL_EXT_swap_control").is_some() {
         if extra.SwapIntervalEXT(if settings.vsync { 1 } else { 0 }) == 0 {
             return Err("wglSwapIntervalEXT failed".to_owned());
         }
@@ -139,7 +142,6 @@ unsafe fn create_full_context(settings: &WGLAttributes,
 }
 
 unsafe fn create_hidden_window() -> Result<winapi::HWND, &'static str> {
-
     let class_name = register_window_class();
     let mut rect = winapi::RECT {
         left: 0,