From aa8e8e2e41ef103f10128f837003e3ce8b0b2b99 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 7 Jan 2015 13:59:05 +0100 Subject: Support threaded OpenGL on linux again. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Broken since 8758f532ae6209bcf9447e27edc4fd412c0f173d. Change-Id: Ifadf37252cc7c1ca68b0a82320b12833f97bf302 Reviewed-by: Jørgen Lind --- .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 6 ++++++ .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h | 3 +++ 2 files changed, 9 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp index a4e603f599..c8ea2053e3 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp @@ -214,4 +214,10 @@ QPlatformOffscreenSurface *QXcbGlxIntegration::createPlatformOffscreenSurface(QO } +bool QXcbGlxIntegration::supportsThreadedOpenGL() const +{ + return QGLXContext::supportsThreading(); +} + + QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h index 2ef40f9ab6..2869fc20a4 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h @@ -60,6 +60,9 @@ public: QXcbWindow *createWindow(QWindow *window) const Q_DECL_OVERRIDE; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE; + + virtual bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE; + private: QXcbConnection *m_connection; uint32_t m_glx_first_event; -- cgit v1.2.3