1 files changed, 7 insertions, 18 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 8a6c418788..8b2315c67e 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -338,14 +338,10 @@ public:
     void *xlib_display() const { return m_xlib_display; }
 #endif
 
-#ifdef XCB_USE_DRI2
-    bool hasSupportForDri2() const;
-    QByteArray dri2DeviceName() const { return m_dri2_device_name; }
-#endif
 #ifdef XCB_USE_EGL
     bool hasEgl() const;
 #endif
-#if defined(XCB_USE_EGL) || defined(XCB_USE_DRI2)
+#if defined(XCB_USE_EGL)
     void *egl_display() const { return m_egl_display; }
 #endif
 #ifdef XCB_USE_XINPUT2_MAEMO
@@ -374,6 +370,7 @@ public:
     inline xcb_timestamp_t time() const { return m_time; }
     inline void setTime(xcb_timestamp_t t) { if (t > m_time) m_time = t; }
 
+    bool hasGLX() const { return has_glx_extension; }
     bool hasXFixes() const { return xfixes_first_event > 0; }
     bool hasXShape() const { return has_shape_extension; }
     bool hasXRandr() const { return has_randr_extension; }
@@ -387,13 +384,11 @@ private slots:
 private:
     void initializeAllAtoms();
     void sendConnectionEvent(QXcbAtom::Atom atom, uint id = 0);
+    void initializeGLX();
     void initializeXFixes();
     void initializeXRender();
     void initializeXRandr();
     void initializeXShape();
-#ifdef XCB_USE_DRI2
-    void initializeDri2();
-#endif
 #ifdef XCB_USE_XINPUT2_MAEMO
     void initializeXInput2Maemo();
     void finalizeXInput2Maemo();
@@ -476,14 +471,7 @@ private:
     QHash<int, QWindowSystemInterface::TouchPoint> m_touchPoints;
     QHash<int, XInput2DeviceData*> m_touchDevices;
 #endif
-#ifdef XCB_USE_DRI2
-    uint32_t m_dri2_major;
-    uint32_t m_dri2_minor;
-    bool m_dri2_support_probed;
-    bool m_has_support_for_dri2;
-    QByteArray m_dri2_device_name;
-#endif
-#if defined(XCB_USE_EGL) || defined(XCB_USE_DRI2)
+#if defined(XCB_USE_EGL)
     void *m_egl_display;
     bool m_has_egl;
 #endif
@@ -507,6 +495,7 @@ private:
     uint32_t xfixes_first_event;
     uint32_t xrandr_first_event;
 
+    bool has_glx_extension;
     bool has_shape_extension;
     bool has_randr_extension;
     bool has_input_shape;
@@ -549,9 +538,9 @@ cookie_t q_xcb_call_template(const cookie_t &cookie, QXcbConnection *connection,
 #endif
 
 
-#if defined(XCB_USE_DRI2) || defined(XCB_USE_EGL)
+#if defined(XCB_USE_EGL)
 #define EGL_DISPLAY_FROM_XCB(object) ((EGLDisplay)(object->connection()->egl_display()))
-#endif //endifXCB_USE_DRI2
+#endif
 
 QT_END_NAMESPACE