Fixed client side issues due to threading bugs.

Our threading support depends on the hardware integration and on support
in libwayland.

Change-Id: Ic69bc4616e279c1986576d8c034db52402cb9c41
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

diff --git a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglintegration.h b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglintegration.h
index 6a46de9..e894a1b 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglintegration.h
+++ b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglintegration.h
@@ -63,6 +63,8 @@ public:
 
     void initialize();
 
+    bool supportsThreadedOpenGL() const { return true; }
+
     QWaylandWindow *createEglWindow(QWindow *window);
     QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const;
 

diff --git a/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h b/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h
index 8a549da..7d5c804 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h
+++ b/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h
@@ -57,6 +57,8 @@ public:
 
     virtual void initialize() = 0;
 
+    virtual bool supportsThreadedOpenGL() const { return false; }
+
     virtual QWaylandWindow *createEglWindow(QWindow *window) = 0;
     virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0;
 

diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp
index eef5f79..45edd88 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp
@@ -46,6 +46,8 @@
 #include "qwaylandeglwindow.h"
 #include "qwaylandglcontext.h"
 
+#include <wayland-client.h>
+
 #include <QtCore/QDebug>
 
 QWaylandEglIntegration::QWaylandEglIntegration(struct wl_display *waylandDisplay)
@@ -79,6 +81,15 @@ void QWaylandEglIntegration::initialize()
     }
 }
 
+bool QWaylandEglIntegration::supportsThreadedOpenGL() const
+{
+#ifdef WAYLAND_CLIENT_THREAD_AFFINITY
+    return true;
+#else
+    return false;
+#endif
+}
+
 QWaylandWindow *QWaylandEglIntegration::createEglWindow(QWindow *window)
 {
     return new QWaylandEglWindow(window);

diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h
index 9d9a883..38ac7e2 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h
@@ -56,6 +56,7 @@ public:
     ~QWaylandEglIntegration();
 
     void initialize();
+    bool supportsThreadedOpenGL() const;
 
     QWaylandWindow *createEglWindow(QWindow *window);
     QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const;

diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 0469f3f..97a259d 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -112,7 +112,11 @@ bool QWaylandIntegration::hasCapability(QPlatformIntegration::Capability cap) co
         return false;
 #endif
     case ThreadedOpenGL:
-        return hasCapability(OpenGL);
+#ifdef QT_WAYLAND_GL_SUPPORT
+        return mDisplay->eglIntegration()->supportsThreadedOpenGL();
+#else
+        return false;
+#endif
     case BufferQueueingOpenGL:
         return true;
     default: return QPlatformIntegration::hasCapability(cap);