diff options
| -rw-r--r-- | src/api/glx/mod.rs | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs index dcdc21c..317d9ff 100644 --- a/src/api/glx/mod.rs +++ b/src/api/glx/mod.rs @@ -360,6 +360,7 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli -> Result<(ffi::glx::types::GLXFBConfig, PixelFormat), ()> { let descriptor = { + let mut glx_non_conformant = false; let mut out: Vec<c_int> = Vec::with_capacity(37); out.push(ffi::glx::X_RENDERABLE as c_int); @@ -382,15 +383,6 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli out.push(ffi::glx::RGBA_BIT as c_int); } - if let Some(hardware_accelerated) = reqs.hardware_accelerated { - out.push(ffi::glx::CONFIG_CAVEAT as c_int); - out.push(if hardware_accelerated { - ffi::glx::NONE as c_int - } else { - ffi::glx::SLOW_CONFIG as c_int - }); - } - if let Some(color) = reqs.color_bits { out.push(ffi::glx::RED_SIZE as c_int); out.push((color / 3) as c_int); @@ -425,6 +417,7 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli out.push(if multisampling == 0 { 0 } else { 1 }); out.push(ffi::glx_extra::SAMPLES_ARB as c_int); out.push(multisampling as c_int); + glx_non_conformant = true; } else { return Err(()); } @@ -452,6 +445,20 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli }, } + if let Some(hardware_accelerated) = reqs.hardware_accelerated { + let caveat = if hardware_accelerated { + ffi::glx::NONE as c_int + } else { + ffi::glx::SLOW_CONFIG as c_int + }; + out.push(ffi::glx::CONFIG_CAVEAT as c_int); + out.push(if glx_non_conformant { + caveat | ffi::glx::NON_CONFORMANT_CONFIG as c_int + } else { + caveat + }); + } + out.push(0); out }; |