From b9065f56ba0c1fa9c55b6af31d765cc326456548 Mon Sep 17 00:00:00 2001
From: Boris-Chengbiao Zhou <bobo1239@web.de>
Date: Wed, 13 Apr 2016 13:37:58 +0200
Subject: glx: Always set CONFIG_CAVEAT to DONT_CARE

---
 src/api/glx/mod.rs | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'src/api/glx')

diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs
index 18f2938..ae5b9c7 100644
--- a/src/api/glx/mod.rs
+++ b/src/api/glx/mod.rs
@@ -360,7 +360,6 @@ 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);
@@ -417,7 +416,6 @@ 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(());
             }
@@ -448,19 +446,8 @@ 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(ffi::glx::CONFIG_CAVEAT as c_int);
+        out.push(ffi::glx::DONT_CARE as c_int);
 
         out.push(0);
         out
-- 
cgit v1.2.3