Add generic OpenGL compositor and backingstore bits

By removing the EGL(FS) dependencies we get classes that can be used
by any platform plugin that runs without a windowing system.

Change-Id: If99b42de5a4da02bbef80863609b6d92c6734613
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>

3 files changed, 19 insertions, 28 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
index 60f7347ba5..a66cff165b 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
@@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE
 QEglFSScreen::QEglFSScreen(EGLDisplay dpy)
     : QEGLPlatformScreen(dpy),
       m_surface(EGL_NO_SURFACE),
-      m_cursor(0),
-      m_rootWindow(0),
-      m_rootContext(0)
+      m_cursor(0)
 {
     m_cursor = QEglFSHooks::hooks()->createCursor(this);
 }
diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h
index c5ab3b52f5..d109ad9d9b 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.h
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.h
@@ -64,12 +64,6 @@ public:
 
     EGLSurface primarySurface() const { return m_surface; }
 
-    QEGLPlatformWindow *compositingWindow() Q_DECL_OVERRIDE { return m_rootWindow; }
-    QOpenGLContext *compositingContext() Q_DECL_OVERRIDE { return m_rootContext; }
-
-    void setRootWindow(QEGLPlatformWindow *window) { m_rootWindow = window; }
-    void setRootContext(QOpenGLContext *context) { m_rootContext = context; }
-
 protected:
     void setPrimarySurface(EGLSurface surface);
 
@@ -78,8 +72,6 @@ private:
 
     EGLSurface m_surface;
     QPlatformCursor *m_cursor;
-    QEGLPlatformWindow *m_rootWindow;
-    QOpenGLContext *m_rootContext;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
index 59c2014d66..0ab19e6065 100644
--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
@@ -39,7 +39,6 @@
 #include <QtGui/QOpenGLContext>
 #include <QtPlatformSupport/private/qeglplatformcursor_p.h>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
-
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -73,9 +72,10 @@ void QEglFSWindow::create()
     // raster windows will not have their own native window, surface and context. Instead,
     // they will be composited onto the root window's surface.
     QEglFSScreen *screen = this->screen();
+    QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
     if (screen->primarySurface() != EGL_NO_SURFACE) {
-        if (isRaster() && screen->compositingWindow()) {
-            m_format = screen->compositingWindow()->format();
+        if (isRaster() && compositor->targetWindow()) {
+            m_format = compositor->targetWindow()->format();
             return;
         }
 
@@ -107,8 +107,7 @@ void QEglFSWindow::create()
         context->setScreen(window()->screen());
         if (!context->create())
             qFatal("EGLFS: Failed to create compositing context");
-        screen->setRootContext(context);
-        screen->setRootWindow(this);
+        compositor->setTarget(context, window());
     }
 }
 
@@ -127,7 +126,7 @@ void QEglFSWindow::destroy()
     }
 
     m_flags = 0;
-    screen->removeWindow(this);
+    QOpenGLCompositor::instance()->removeWindow(this);
 }
 
 // The virtual functions resetSurface and invalidateSurface may get overridden
@@ -160,17 +159,18 @@ void QEglFSWindow::resetSurface()
 
 void QEglFSWindow::setVisible(bool visible)
 {
-    QList<QEGLPlatformWindow *> windows = screen()->windows();
+    QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
+    QList<QOpenGLCompositorWindow *> windows = compositor->windows();
     QWindow *wnd = window();
 
     if (wnd->type() != Qt::Desktop) {
         if (visible) {
-            screen()->addWindow(this);
+            compositor->addWindow(this);
         } else {
-            screen()->removeWindow(this);
-            windows = screen()->windows();
+            compositor->removeWindow(this);
+            windows = compositor->windows();
             if (windows.size())
-                windows.last()->requestActivateWindow();
+                windows.last()->sourceWindow()->requestActivate();
         }
     }
 
@@ -210,7 +210,7 @@ QRect QEglFSWindow::geometry() const
 void QEglFSWindow::requestActivateWindow()
 {
     if (window()->type() != Qt::Desktop)
-        screen()->moveToTop(this);
+        QOpenGLCompositor::instance()->moveToTop(this);
 
     QWindow *wnd = window();
     QWindowSystemInterface::handleWindowActivated(wnd);
@@ -221,20 +221,21 @@ void QEglFSWindow::raise()
 {
     QWindow *wnd = window();
     if (wnd->type() != Qt::Desktop) {
-        screen()->moveToTop(this);
+        QOpenGLCompositor::instance()->moveToTop(this);
         QWindowSystemInterface::handleExposeEvent(wnd, QRect(QPoint(0, 0), wnd->geometry().size()));
     }
 }
 
 void QEglFSWindow::lower()
 {
-    QList<QEGLPlatformWindow *> windows = screen()->windows();
+    QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
+    QList<QOpenGLCompositorWindow *> windows = compositor->windows();
     if (window()->type() != Qt::Desktop && windows.count() > 1) {
         int idx = windows.indexOf(this);
         if (idx > 0) {
-            screen()->changeWindowIndex(this, idx - 1);
-            QWindowSystemInterface::handleExposeEvent(windows.last()->window(),
-                                                      QRect(QPoint(0, 0), windows.last()->geometry().size()));
+            compositor->changeWindowIndex(this, idx - 1);
+            QWindowSystemInterface::handleExposeEvent(windows.last()->sourceWindow(),
+                                                      QRect(QPoint(0, 0), windows.last()->sourceWindow()->geometry().size()));
         }
     }
 }