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

Use the WGL API to determine extended pixel format, plus fix creation

Browse source
This commit is contained in:
Pierre Krieger 2015-03-01 10:33:25 +01:00
parent 77d8a11338
commit cf252c29b4
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/lib.rs
View file

@ -195,6 +195,7 @@ pub enum MouseCursor {
/// Describes a possible format. Unused. /// Describes a possible format. Unused.
#[allow(missing_docs)] #[allow(missing_docs)]
#[derive(Debug)]
pub struct PixelFormat { pub struct PixelFormat {
pub red_bits: u8, pub red_bits: u8,
pub green_bits: u8, pub green_bits: u8,

68
src/win32/init.rs
View file

@ -99,9 +99,8 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
// adjusting the window coordinates using the style // adjusting the window coordinates using the style
unsafe { user32::AdjustWindowRectEx(&mut rect, style, 0, ex_style) }; unsafe { user32::AdjustWindowRectEx(&mut rect, style, 0, ex_style) };
// getting the address of wglCreateContextAttribsARB and the pixel format // getting the address of wglCreateContextAttribsARB
// that we will use let extra_functions = {
let (extra_functions, pixel_format) = {
// creating a dummy invisible window for GL initialization // creating a dummy invisible window for GL initialization
let dummy_window = unsafe { let dummy_window = unsafe {
let handle = user32::CreateWindowExW(ex_style, class_name.as_ptr(), let handle = user32::CreateWindowExW(ex_style, class_name.as_ptr(),
@ -132,32 +131,11 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
hdc hdc
}; };
// getting the pixel format that we will use // getting the pixel format that we will use and setting it
let pixel_format = { {
let formats = enumerate_native_pixel_formats(dummy_hdc); let formats = enumerate_native_pixel_formats(dummy_hdc);
let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))); let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
try!(set_pixel_format(dummy_hdc, id));
let mut output: winapi::PIXELFORMATDESCRIPTOR = unsafe { mem::zeroed() };
if unsafe { gdi32::DescribePixelFormat(dummy_hdc, id,
mem::size_of::<winapi::PIXELFORMATDESCRIPTOR>() as winapi::UINT, &mut output) } == 0
{
let err = Err(OsError(format!("DescribePixelFormat function failed: {}",
os::error_string(os::errno()))));
unsafe { user32::DestroyWindow(dummy_window); }
return err;
}
output
};
// calling SetPixelFormat
unsafe {
if gdi32::SetPixelFormat(dummy_hdc, 1, &pixel_format) == 0 {
let err = Err(OsError(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno()))));
user32::DestroyWindow(dummy_window);
return err;
}
} }
// creating the dummy OpenGL context // creating the dummy OpenGL context
@ -186,7 +164,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
unsafe { user32::DestroyWindow(dummy_window); } unsafe { user32::DestroyWindow(dummy_window); }
// returning the address // returning the address
(extra_functions, pixel_format) extra_functions
}; };
// creating the real window this time // creating the real window this time
@ -233,13 +211,15 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
}; };
// calling SetPixelFormat // calling SetPixelFormat
unsafe { {
if gdi32::SetPixelFormat(hdc, 1, &pixel_format) == 0 { let formats = if extra_functions.GetPixelFormatAttribivARB.is_loaded() {
let err = Err(OsError(format!("SetPixelFormat function failed: {}", enumerate_arb_pixel_formats(&extra_functions, hdc)
os::error_string(os::errno())))); } else {
user32::DestroyWindow(real_window); enumerate_native_pixel_formats(hdc)
return err; };
}
let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
try!(set_pixel_format(hdc, id));
} }
// creating the OpenGL context // creating the OpenGL context
@ -512,6 +492,24 @@ fn enumerate_arb_pixel_formats(extra: &gl::wgl_extra::Wgl, hdc: winapi::HDC)
result result
} }
fn set_pixel_format(hdc: winapi::HDC, id: libc::c_int) -> Result<(), CreationError> {
let mut output: winapi::PIXELFORMATDESCRIPTOR = unsafe { mem::zeroed() };
if unsafe { gdi32::DescribePixelFormat(hdc, id,
mem::size_of::<winapi::PIXELFORMATDESCRIPTOR>() as winapi::UINT, &mut output) } == 0
{
return Err(OsError(format!("DescribePixelFormat function failed: {}",
os::error_string(os::errno()))));
}
if unsafe { gdi32::SetPixelFormat(hdc, id, &output) } == 0 {
return Err(OsError(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno()))));
}
Ok(())
}
fn load_opengl32_dll() -> Result<winapi::HMODULE, CreationError> { fn load_opengl32_dll() -> Result<winapi::HMODULE, CreationError> {
let name = "opengl32.dll".utf16_units().chain(Some(0).into_iter()) let name = "opengl32.dll".utf16_units().chain(Some(0).into_iter())
.collect::<Vec<u16>>().as_ptr(); .collect::<Vec<u16>>().as_ptr();