Rename QWaylandGLIntegration to QWaylandClientBufferIntegration

also add a factory to load QWaylandClientBufferIntegrationPlugins

Change-Id: Ia6a03627659b0452439ae664fceef21eaf0f6de0
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

11 files changed, 55 insertions, 57 deletions

diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
index 17ad89dde..372957f8a 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglintegration.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
@@ -39,9 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandeglintegration.h"
-
-#include <QtWaylandClient/qwaylandglintegration.h>
+#include "qwaylandeglclientbufferintegration.h"
 
 #include "qwaylandeglwindow.h"
 #include "qwaylandglcontext.h"
@@ -57,7 +55,7 @@ static const char *qwaylandegl_threadedgl_blacklist_vendor[] = {
     0
 };
 
-QWaylandEglIntegration::QWaylandEglIntegration(QWaylandDisplay *display)
+QWaylandEglClientBufferIntegration::QWaylandEglClientBufferIntegration(QWaylandDisplay *display)
     : m_waylandDisplay(display->wl_display())
     , m_supportsThreading(false)
 {
@@ -65,12 +63,12 @@ QWaylandEglIntegration::QWaylandEglIntegration(QWaylandDisplay *display)
 }
 
 
-QWaylandEglIntegration::~QWaylandEglIntegration()
+QWaylandEglClientBufferIntegration::~QWaylandEglClientBufferIntegration()
 {
     eglTerminate(m_eglDisplay);
 }
 
-void QWaylandEglIntegration::initialize()
+void QWaylandEglClientBufferIntegration::initialize()
 {
     QByteArray eglPlatform = qgetenv("EGL_PLATFORM");
     if (eglPlatform.isEmpty()) {
@@ -101,22 +99,22 @@ void QWaylandEglIntegration::initialize()
     }
 }
 
-bool QWaylandEglIntegration::supportsThreadedOpenGL() const
+bool QWaylandEglClientBufferIntegration::supportsThreadedOpenGL() const
 {
     return m_supportsThreading;
 }
 
-QWaylandWindow *QWaylandEglIntegration::createEglWindow(QWindow *window)
+QWaylandWindow *QWaylandEglClientBufferIntegration::createEglWindow(QWindow *window)
 {
     return new QWaylandEglWindow(window);
 }
 
-QPlatformOpenGLContext *QWaylandEglIntegration::createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const
+QPlatformOpenGLContext *QWaylandEglClientBufferIntegration::createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const
 {
     return new QWaylandGLContext(m_eglDisplay, glFormat, share);
 }
 
-EGLDisplay QWaylandEglIntegration::eglDisplay() const
+EGLDisplay QWaylandEglClientBufferIntegration::eglDisplay() const
 {
     return m_eglDisplay;
 }
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
index 4e14f354a..15964c999 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglintegration.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDEGLINTEGRATION_H
 #define QWAYLANDEGLINTEGRATION_H
 
-#include <QtWaylandClient/qwaylandglintegration.h>
+#include <QtWaylandClient/qwaylandclientbufferintegration.h>
 
 #include "qwaylandeglinclude.h"
 
@@ -51,11 +51,11 @@ QT_BEGIN_NAMESPACE
 class QWaylandWindow;
 class QWindow;
 
-class QWaylandEglIntegration : public QWaylandGLIntegration
+class QWaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    QWaylandEglIntegration(QWaylandDisplay *display);
-    ~QWaylandEglIntegration();
+    QWaylandEglClientBufferIntegration(QWaylandDisplay *display);
+    ~QWaylandEglClientBufferIntegration();
 
     void initialize();
     bool supportsThreadedOpenGL() const;
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index 0bcaf0e23..5be78b5db 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 QWaylandEglWindow::QWaylandEglWindow(QWindow *window)
     : QWaylandWindow(window)
-    , m_eglIntegration(static_cast<QWaylandEglIntegration *>(mDisplay->glIntegration()))
+    , m_clientBufferIntegration(static_cast<QWaylandEglClientBufferIntegration *>(mDisplay->clientBufferIntegration()))
     , m_waylandEglWindow(0)
     , m_eglSurface(0)
     , m_eglConfig(0)
@@ -70,7 +70,7 @@ QWaylandEglWindow::QWaylandEglWindow(QWindow *window)
 QWaylandEglWindow::~QWaylandEglWindow()
 {
     if (m_eglSurface) {
-        eglDestroySurface(m_eglIntegration->eglDisplay(), m_eglSurface);
+        eglDestroySurface(m_clientBufferIntegration->eglDisplay(), m_eglSurface);
         m_eglSurface = 0;
     }
 
@@ -129,11 +129,11 @@ EGLSurface QWaylandEglWindow::eglSurface() const
     }
 
     if (!m_eglSurface) {
-        m_eglConfig = q_configFromGLFormat(m_eglIntegration->eglDisplay(), window()->format(), true);
-        const_cast<QWaylandEglWindow *>(this)->m_format = q_glFormatFromConfig(m_eglIntegration->eglDisplay(),m_eglConfig);
+        m_eglConfig = q_configFromGLFormat(m_clientBufferIntegration->eglDisplay(), window()->format(), true);
+        const_cast<QWaylandEglWindow *>(this)->m_format = q_glFormatFromConfig(m_clientBufferIntegration->eglDisplay(),m_eglConfig);
 
         EGLNativeWindowType window = (EGLNativeWindowType) m_waylandEglWindow;
-        m_eglSurface = eglCreateWindowSurface(m_eglIntegration->eglDisplay(), m_eglConfig, window, 0);
+        m_eglSurface = eglCreateWindowSurface(m_clientBufferIntegration->eglDisplay(), m_eglConfig, window, 0);
     }
 
     return m_eglSurface;
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index b20e2ad01..06ba1b0b0 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -44,7 +44,7 @@
 
 #include <QtWaylandClient/qwaylandwindow.h>
 #include "qwaylandeglinclude.h"
-#include "qwaylandeglintegration.h"
+#include "qwaylandeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +70,7 @@ public:
     void bindContentFBO();
 
 private:
-    QWaylandEglIntegration *m_eglIntegration;
+    QWaylandEglClientBufferIntegration *m_clientBufferIntegration;
     mutable struct wl_egl_window *m_waylandEglWindow;
 
     const QWaylandWindow *m_parentWindow;
diff --git a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
index 906520666..bf03a8c72 100644
--- a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
@@ -6,11 +6,11 @@ INCLUDEPATH += $$PWD
     LIBS += -lwayland-egl -lEGL
 }
 
-SOURCES += $$PWD/qwaylandeglintegration.cpp \
+SOURCES += $$PWD/qwaylandeglclientbufferintegration.cpp \
            $$PWD/qwaylandglcontext.cpp \
            $$PWD/qwaylandeglwindow.cpp
 
-HEADERS += $$PWD/qwaylandeglintegration.h \
+HEADERS += $$PWD/qwaylandeglclientbufferintegration.h \
            $$PWD/qwaylandglcontext.h \
            $$PWD/qwaylandeglwindow.h \
            $$PWD/qwaylandeglinclude.h
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
index ae644e944..ed60e9bb6 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglintegration.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxcompositeeglintegration.h"
+#include "qwaylandxcompositeeglclientbufferintegration.h"
 
 #include "qwaylandxcompositeeglwindow.h"
 
@@ -49,81 +49,81 @@
 
 QT_BEGIN_NAMESPACE
 
-QWaylandXCompositeEGLIntegration::QWaylandXCompositeEGLIntegration(QWaylandDisplay * waylandDisplay)
-    : QWaylandGLIntegration()
+QWaylandXCompositeEGLClientBufferIntegration::QWaylandXCompositeEGLClientBufferIntegration(QWaylandDisplay * waylandDisplay)
+    : QWaylandClientBufferIntegration()
     , mWaylandDisplay(waylandDisplay)
 {
     qDebug() << "Using XComposite-EGL";
     waylandDisplay->addRegistryListener(&wlDisplayHandleGlobal, this);
 }
 
-QWaylandXCompositeEGLIntegration::~QWaylandXCompositeEGLIntegration()
+QWaylandXCompositeEGLClientBufferIntegration::~QWaylandXCompositeEGLClientBufferIntegration()
 {
     XCloseDisplay(mDisplay);
 }
 
-void QWaylandXCompositeEGLIntegration::initialize()
+void QWaylandXCompositeEGLClientBufferIntegration::initialize()
 {
 }
 
-QWaylandWindow * QWaylandXCompositeEGLIntegration::createEglWindow(QWindow *window)
+QWaylandWindow * QWaylandXCompositeEGLClientBufferIntegration::createEglWindow(QWindow *window)
 {
     return new QWaylandXCompositeEGLWindow(window,this);
 }
 
-QPlatformOpenGLContext *QWaylandXCompositeEGLIntegration::createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const
+QPlatformOpenGLContext *QWaylandXCompositeEGLClientBufferIntegration::createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const
 {
     return new QWaylandXCompositeEGLContext(glFormat, share, eglDisplay());
 }
 
-Display * QWaylandXCompositeEGLIntegration::xDisplay() const
+Display * QWaylandXCompositeEGLClientBufferIntegration::xDisplay() const
 {
     return mDisplay;
 }
 
-EGLDisplay QWaylandXCompositeEGLIntegration::eglDisplay() const
+EGLDisplay QWaylandXCompositeEGLClientBufferIntegration::eglDisplay() const
 {
     return mEglDisplay;
 }
 
-int QWaylandXCompositeEGLIntegration::screen() const
+int QWaylandXCompositeEGLClientBufferIntegration::screen() const
 {
     return mScreen;
 }
 
-Window QWaylandXCompositeEGLIntegration::rootWindow() const
+Window QWaylandXCompositeEGLClientBufferIntegration::rootWindow() const
 {
     return mRootWindow;
 }
 
-QWaylandDisplay * QWaylandXCompositeEGLIntegration::waylandDisplay() const
+QWaylandDisplay * QWaylandXCompositeEGLClientBufferIntegration::waylandDisplay() const
 {
     return mWaylandDisplay;
 }
-qt_xcomposite * QWaylandXCompositeEGLIntegration::waylandXComposite() const
+qt_xcomposite * QWaylandXCompositeEGLClientBufferIntegration::waylandXComposite() const
 {
     return mWaylandComposite;
 }
 
-const struct qt_xcomposite_listener QWaylandXCompositeEGLIntegration::xcomposite_listener = {
-    QWaylandXCompositeEGLIntegration::rootInformation
+const struct qt_xcomposite_listener QWaylandXCompositeEGLClientBufferIntegration::xcomposite_listener = {
+    QWaylandXCompositeEGLClientBufferIntegration::rootInformation
 };
 
-void QWaylandXCompositeEGLIntegration::wlDisplayHandleGlobal(void *data, wl_registry *registry, uint32_t id, const QString &interface, uint32_t version)
+void QWaylandXCompositeEGLClientBufferIntegration::wlDisplayHandleGlobal(void *data, wl_registry *registry, uint32_t id, const QString &interface, uint32_t version)
 {
     Q_UNUSED(version);
     if (interface == "qt_xcomposite") {
-        QWaylandXCompositeEGLIntegration *integration = static_cast<QWaylandXCompositeEGLIntegration *>(data);
+        QWaylandXCompositeEGLClientBufferIntegration *integration = static_cast<QWaylandXCompositeEGLClientBufferIntegration *>(data);
         integration->mWaylandComposite = static_cast<struct qt_xcomposite *>(wl_registry_bind(registry,id,&qt_xcomposite_interface,1));
         qt_xcomposite_add_listener(integration->mWaylandComposite,&xcomposite_listener,integration);
     }
 
 }
 
-void QWaylandXCompositeEGLIntegration::rootInformation(void *data, qt_xcomposite *xcomposite, const char *display_name, uint32_t root_window)
+void QWaylandXCompositeEGLClientBufferIntegration::rootInformation(void *data, qt_xcomposite *xcomposite, const char *display_name, uint32_t root_window)
 {
     Q_UNUSED(xcomposite);
-    QWaylandXCompositeEGLIntegration *integration = static_cast<QWaylandXCompositeEGLIntegration *>(data);
+    QWaylandXCompositeEGLClientBufferIntegration *integration = static_cast<QWaylandXCompositeEGLClientBufferIntegration *>(data);
 
     integration->mDisplay = XOpenDisplay(display_name);
     integration->mRootWindow = (Window) root_window;
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
index 1c165d817..0a8cc0f6c 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QWAYLANDXCOMPOSITEEGLINTEGRATION_H
-#define QWAYLANDXCOMPOSITEEGLINTEGRATION_H
+#ifndef QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H
+#define QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H
 
-#include <QtWaylandClient/qwaylandglintegration.h>
+#include <QtWaylandClient/qwaylandclientbufferintegration.h>
 #include "wayland-client.h"
 
 #include <QtCore/QTextStream>
@@ -68,11 +68,11 @@ struct qt_xcomposite;
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandXCompositeEGLIntegration : public QWaylandGLIntegration
+class QWaylandXCompositeEGLClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    QWaylandXCompositeEGLIntegration(QWaylandDisplay * waylandDispaly);
-    ~QWaylandXCompositeEGLIntegration();
+    QWaylandXCompositeEGLClientBufferIntegration(QWaylandDisplay * waylandDispaly);
+    ~QWaylandXCompositeEGLClientBufferIntegration();
 
     void initialize();
     bool waitingForEvents() { return !mDisplay; }
@@ -111,4 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QWAYLANDXCOMPOSITEEGLINTEGRATION_H
+#endif // QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
index 32cdb4322..bc988480d 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -44,7 +44,7 @@
 
 #include <qpa/qplatformopenglcontext.h>
 
-#include "qwaylandxcompositeeglintegration.h"
+#include "qwaylandxcompositeeglclientbufferintegration.h"
 
 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
index f0df2bd2d..3d19dbe3f 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
@@ -48,13 +48,13 @@
 #include "wayland-xcomposite-client-protocol.h"
 
 #include <X11/extensions/Xcomposite.h>
-#include "qwaylandxcompositeeglintegration.h"
+#include "qwaylandxcompositeeglclientbufferintegration.h"
 
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
-QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLIntegration *glxIntegration)
+QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration)
     : QWaylandWindow(window)
     , m_glxIntegration(glxIntegration)
     , m_context(0)
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
index bd37ee7cf..9e512ec7c 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
@@ -45,7 +45,7 @@
 #include <QtWaylandClient/qwaylandwindow.h>
 #include <QtWaylandClient/qwaylandbuffer.h>
 
-#include "qwaylandxcompositeeglintegration.h"
+#include "qwaylandxcompositeeglclientbufferintegration.h"
 #include "qwaylandxcompositeeglcontext.h"
 
 QT_BEGIN_NAMESPACE
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandXCompositeEGLWindow : public QWaylandWindow
 {
 public:
-    QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLIntegration *glxIntegration);
+    QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration);
     WindowType windowType() const;
 
     void setGeometry(const QRect &rect);
@@ -63,7 +63,7 @@ public:
 private:
     void createEglSurface();
 
-    QWaylandXCompositeEGLIntegration *m_glxIntegration;
+    QWaylandXCompositeEGLClientBufferIntegration *m_glxIntegration;
     QWaylandXCompositeEGLContext *m_context;
     QWaylandBuffer *m_buffer;
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
index fc34575f5..fa08daaf2 100644
--- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
+++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
@@ -10,10 +10,10 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri)
 
 SOURCES += \
     $$PWD/qwaylandxcompositeeglcontext.cpp \
-    $$PWD/qwaylandxcompositeeglintegration.cpp \
+    $$PWD/qwaylandxcompositeeglclientbufferintegration.cpp \
     $$PWD/qwaylandxcompositeeglwindow.cpp
 
 HEADERS += \
     $$PWD/qwaylandxcompositeeglcontext.h \
-    $$PWD/qwaylandxcompositeeglintegration.h \
+    $$PWD/qwaylandxcompositeeglclientbufferintegration.h \
     $$PWD/qwaylandxcompositeeglwindow.h