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

choose_pixel_format now returns a Result

Browse source
This commit is contained in:
Pierre Krieger 2015-03-26 19:07:59 +01:00
parent d7c44b95b0
commit 697d42a64f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -304,7 +304,7 @@ impl<'a> BuilderAttribs<'a> {
(new_attribs, sharing) (new_attribs, sharing)
} }
fn choose_pixel_format<T, I>(&self, iter: I) -> (T, PixelFormat) fn choose_pixel_format<T, I>(&self, iter: I) -> Result<(T, PixelFormat), CreationError>
where I: Iterator<Item=(T, PixelFormat)>, T: Clone where I: Iterator<Item=(T, PixelFormat)>, T: Clone
{ {
let mut current_result = None; let mut current_result = None;
@ -343,7 +343,7 @@ impl<'a> BuilderAttribs<'a> {
} }
current_result.or(current_software_result) current_result.or(current_software_result)
.expect("Could not find compliant pixel format") .ok_or(CreationError::NotSupported)
} }
} }

4
src/win32/init.rs
View file

@ -136,7 +136,7 @@ unsafe fn init(title: Vec<u16>, builder: BuilderAttribs<'static>,
// getting the pixel format that we will use and setting it // getting the pixel format that we will use and setting it
{ {
let formats = enumerate_native_pixel_formats(&dummy_window); let formats = enumerate_native_pixel_formats(&dummy_window);
let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))); let (id, _) = try!(builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))));
try!(set_pixel_format(&dummy_window, id)); try!(set_pixel_format(&dummy_window, id));
} }
@ -206,7 +206,7 @@ unsafe fn init(title: Vec<u16>, builder: BuilderAttribs<'static>,
enumerate_native_pixel_formats(&real_window) enumerate_native_pixel_formats(&real_window)
}; };
let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))); let (id, _) = try!(builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))));
try!(set_pixel_format(&real_window, id)); try!(set_pixel_format(&real_window, id));
} }