aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-03-01 11:46:58 +0100
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-03-01 11:46:58 +0100
commit42d38e66ab51c1095d65683494dfabf80552bf92 (patch)
treea34eae9c42ce0f7eff918e3fe90c37a21826b66d
parent7ba8fdf3f33b9502007901a2399f915047cac8fc (diff)
downloadglutin-42d38e66ab51c1095d65683494dfabf80552bf92.tar.gz
glutin-42d38e66ab51c1095d65683494dfabf80552bf92.zip
Allow using non-hardware-accelerated pixel formats
-rw-r--r--src/lib.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib.rs b/src/lib.rs
index ecb6980..10727d1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -195,7 +195,7 @@ pub enum MouseCursor {
/// Describes a possible format. Unused.
#[allow(missing_docs)]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub struct PixelFormat {
pub hardware_accelerated: bool,
pub red_bits: u8,
@@ -284,13 +284,10 @@ impl<'a> BuilderAttribs<'a> {
where I: Iterator<Item=(T, PixelFormat)>, T: Clone
{
let mut current_result = None;
+ let mut current_software_result = None;
// TODO: do this more properly
for (id, format) in iter {
- if !format.hardware_accelerated {
- continue;
- }
-
if format.red_bits + format.green_bits + format.blue_bits < self.color_bits.unwrap_or(0) {
continue;
}
@@ -315,9 +312,13 @@ impl<'a> BuilderAttribs<'a> {
continue;
}
- current_result = Some((id, format));
+ current_software_result = Some((id.clone(), format.clone()));
+ if format.hardware_accelerated {
+ current_result = Some((id, format));
+ }
}
- current_result.expect("Could not find compliant pixel format")
+ current_result.or(current_software_result)
+ .expect("Could not find compliant pixel format")
}
}