aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib.rs1
-rw-r--r--src/win32/init.rs68
2 files changed, 34 insertions, 35 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 4ab577a..138f87b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -195,6 +195,7 @@ pub enum MouseCursor {
/// Describes a possible format. Unused.
#[allow(missing_docs)]
+#[derive(Debug)]
pub struct PixelFormat {
pub red_bits: u8,
pub green_bits: u8,
diff --git a/src/win32/init.rs b/src/win32/init.rs
index d468820..6fdafea 100644
--- a/src/win32/init.rs
+++ b/src/win32/init.rs
@@ -99,9 +99,8 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
// adjusting the window coordinates using the style
unsafe { user32::AdjustWindowRectEx(&mut rect, style, 0, ex_style) };
- // getting the address of wglCreateContextAttribsARB and the pixel format
- // that we will use
- let (extra_functions, pixel_format) = {
+ // getting the address of wglCreateContextAttribsARB
+ let extra_functions = {
// creating a dummy invisible window for GL initialization
let dummy_window = unsafe {
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
};
- // getting the pixel format that we will use
- let pixel_format = {
+ // getting the pixel format that we will use and setting it
+ {
let formats = enumerate_native_pixel_formats(dummy_hdc);
let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
-
- 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;
- }
+ try!(set_pixel_format(dummy_hdc, id));
}
// 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); }
// returning the address
- (extra_functions, pixel_format)
+ extra_functions
};
// creating the real window this time
@@ -233,13 +211,15 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
};
// calling SetPixelFormat
- unsafe {
- if gdi32::SetPixelFormat(hdc, 1, &pixel_format) == 0 {
- let err = Err(OsError(format!("SetPixelFormat function failed: {}",
- os::error_string(os::errno()))));
- user32::DestroyWindow(real_window);
- return err;
- }
+ {
+ let formats = if extra_functions.GetPixelFormatAttribivARB.is_loaded() {
+ enumerate_arb_pixel_formats(&extra_functions, hdc)
+ } else {
+ enumerate_native_pixel_formats(hdc)
+ };
+
+ let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
+ try!(set_pixel_format(hdc, id));
}
// creating the OpenGL context
@@ -512,6 +492,24 @@ fn enumerate_arb_pixel_formats(extra: &gl::wgl_extra::Wgl, hdc: winapi::HDC)
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> {
let name = "opengl32.dll".utf16_units().chain(Some(0).into_iter())
.collect::<Vec<u16>>().as_ptr();