diff options
author | Samuel Rødal <samuel.rodal@digia.com> | 2012-10-08 12:53:56 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 20:24:11 +0200 |
commit | 39eaff6773fc4f05fc95473b769b3a2f0301e12b (patch) | |
tree | bc2943a5000eab5c3a8e3d2a0b39f654ddbd7059 /src/plugins/platforms/xcb/qxcbconnection.h | |
parent | 9b2e4cd5a8cac007aa702ce5f822e78e54707a07 (diff) |
Remove DRI2/OpenGL code paths from xcb plugin.
These were used to test QtWayland, but there are other options available
for that now. The DRI2 code hasn't been maintained and doesn't even
compile at the moment, so let's just remove it to de-clutter the source.
Change-Id: I7db0f4db82348497b9f4d6c2dcf2e13f3ab14a76
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index cbfdd803f2..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 @@ -393,9 +389,6 @@ private: void initializeXRender(); void initializeXRandr(); void initializeXShape(); -#ifdef XCB_USE_DRI2 - void initializeDri2(); -#endif #ifdef XCB_USE_XINPUT2_MAEMO void initializeXInput2Maemo(); void finalizeXInput2Maemo(); @@ -478,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 @@ -552,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 |