alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #519 from tomaka/win32-err

Browse source 
Better win32 error messages
This commit is contained in:
tomaka 2015-07-09 11:06:51 +02:00
parent d3fd00968e bbd31608e8
commit a15d42069e
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/api/wgl/mod.rs
View file

@ -216,7 +216,7 @@ unsafe fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'st
{ {
let share = share.unwrap_or(ptr::null_mut()); let share = share.unwrap_or(ptr::null_mut());
let ctxt = if let Some((extra_functions, builder, extensions)) = extra { if let Some((extra_functions, builder, extensions)) = extra {
if extensions.split(' ').find(|&i| i == "WGL_ARB_create_context").is_some() { if extensions.split(' ').find(|&i| i == "WGL_ARB_create_context").is_some() {
let mut attributes = Vec::new(); let mut attributes = Vec::new();
@ -308,33 +308,32 @@ unsafe fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'st
attributes.push(0); attributes.push(0);
Some(extra_functions.CreateContextAttribsARB(hdc as *const libc::c_void, let ctxt = extra_functions.CreateContextAttribsARB(hdc as *const libc::c_void,
share as *const libc::c_void, share as *const libc::c_void,
attributes.as_ptr())) attributes.as_ptr());
} else { if ctxt.is_null() {
None return Err(CreationError::OsError(format!("wglCreateContextAttribsARB failed: {}",
} format!("{}", io::Error::last_os_error()))));
} else { } else {
None return Ok(ContextWrapper(ctxt as winapi::HGLRC));
}; }
let ctxt = match ctxt {
Some(ctxt) => ctxt,
None => {
let ctxt = gl::wgl::CreateContext(hdc as *const libc::c_void);
if !ctxt.is_null() && !share.is_null() {
gl::wgl::ShareLists(share as *const libc::c_void, ctxt);
};
ctxt
} }
}; };
let ctxt = gl::wgl::CreateContext(hdc as *const libc::c_void);
if ctxt.is_null() { if ctxt.is_null() {
return Err(CreationError::OsError(format!("OpenGL context creation failed: {}", return Err(CreationError::OsError(format!("wglCreateContext failed: {}",
format!("{}", io::Error::last_os_error())))); format!("{}", io::Error::last_os_error()))));
} }
if !share.is_null() {
if gl::wgl::ShareLists(share as *const libc::c_void, ctxt) == 0 {
return Err(CreationError::OsError(format!("wglShareLists failed: {}",
format!("{}", io::Error::last_os_error()))));
}
};
Ok(ContextWrapper(ctxt as winapi::HGLRC)) Ok(ContextWrapper(ctxt as winapi::HGLRC))
} }