Merge lp:~dandrader/qtubuntu/offscreenSurface-lp1527737 into lp:qtubuntu

[Daniel d'Andrada]

Implement QPlatformOffscreenSurface

Otherwise Qt might create a full QPlatformWindow during shutdown (which will cause the creation of a mir surface) while cleaning up the GL context and we don't want that.

Helps to sanitize the situation of bug 1527737 (as the spurious surface creation on shutdown was taking place there), but *does not* fix it.

[Gerry Boland (gerboland)]

Code looks good to me. Found no negative impact on phone, need to check desktop.

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/83/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/292/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Fine on desktop

review: Approve

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2016-01-05 14:28:30 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-01-05 14:28:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -15,8 +15,11 @@
  */
 
 #include "glcontext.h"
+#include "logging.h"
+#include "offscreensurface.h"
 #include "window.h"
-#include "logging.h"
+
+#include <QOpenGLFramebufferObject>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
 static void printOpenGLESConfig() {
@@ -71,13 +74,23 @@
 bool UbuntuOpenGLContext::makeCurrent(QPlatformSurface* surface)
 {
     Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
-    EGLSurface eglSurface = static_cast<UbuntuWindow*>(surface)->eglSurface();
-    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-    ASSERT(eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext) == EGL_TRUE);
-    if (ubuntumirclient().isDebugEnabled()) {
-        printOpenGLESConfig();
+
+    if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
+        auto offscreen = static_cast<UbuntuOffscreenSurface *>(surface);
+        if (!offscreen->buffer()) {
+            auto buffer = new QOpenGLFramebufferObject(surface->surface()->size());
+            offscreen->setBuffer(buffer);
+        }
+        return offscreen->buffer()->bind();
+    } else {
+        EGLSurface eglSurface = static_cast<UbuntuWindow*>(surface)->eglSurface();
+        ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+        ASSERT(eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext) == EGL_TRUE);
+        if (ubuntumirclient().isDebugEnabled()) {
+            printOpenGLESConfig();
+        }
+        return true;
     }
-    return true;
 }
 
 void UbuntuOpenGLContext::doneCurrent()

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-01-05 14:28:30 +0000
+++ src/ubuntumirclient/integration.cpp	2016-01-05 14:28:30 +0000
@@ -22,6 +22,7 @@
 #include "input.h"
 #include "logging.h"
 #include "nativeinterface.h"
+#include "offscreensurface.h"
 #include "screen.h"
 #include "theme.h"
 #include "window.h"
@@ -255,3 +256,9 @@
 {
     return mNativeInterface;
 }
+
+QPlatformOffscreenSurface *UbuntuClientIntegration::createPlatformOffscreenSurface(
+        QOffscreenSurface *surface) const
+{
+    return new UbuntuOffscreenSurface(surface);
+}

=== modified file 'src/ubuntumirclient/integration.h'
--- src/ubuntumirclient/integration.h	2015-08-27 09:41:47 +0000
+++ src/ubuntumirclient/integration.h	2016-01-05 14:28:30 +0000
@@ -55,6 +55,8 @@
     QPlatformWindow* createPlatformWindow(QWindow* window);
     UbuntuScreen* screen() const { return mScreen; }
 
+    QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
+
 private:
     void setupOptions();
     void setupDescription();

=== added file 'src/ubuntumirclient/offscreensurface.cpp'
--- src/ubuntumirclient/offscreensurface.cpp	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/offscreensurface.cpp	2016-01-05 14:28:30 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "offscreensurface.h"
+
+#include <QOffscreenSurface>
+#include <QOpenGLFramebufferObject>
+
+UbuntuOffscreenSurface::UbuntuOffscreenSurface(QOffscreenSurface *offscreenSurface)
+    : QPlatformOffscreenSurface(offscreenSurface)
+    , m_buffer(nullptr)
+    , m_format(offscreenSurface->requestedFormat())
+{
+}
+
+QSurfaceFormat UbuntuOffscreenSurface::format() const
+{
+    return m_format;
+}
+
+bool UbuntuOffscreenSurface::isValid() const
+{
+    return m_buffer != nullptr && m_buffer->isValid();
+}
+
+QOpenGLFramebufferObject* UbuntuOffscreenSurface::buffer() const
+{
+    return m_buffer;
+}
+
+void UbuntuOffscreenSurface::setBuffer(QOpenGLFramebufferObject *buffer)
+{
+    m_buffer = buffer;
+}

=== added file 'src/ubuntumirclient/offscreensurface.h'
--- src/ubuntumirclient/offscreensurface.h	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/offscreensurface.h	2016-01-05 14:28:30 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTU_OFFSCREEN_SURFACE_H
+#define UBUNTU_OFFSCREEN_SURFACE_H
+
+#include <qpa/qplatformoffscreensurface.h>
+#include <QSurfaceFormat>
+
+class QOpenGLFramebufferObject;
+
+class UbuntuOffscreenSurface : public QPlatformOffscreenSurface
+{
+public:
+    UbuntuOffscreenSurface(QOffscreenSurface *offscreenSurface);
+
+    QSurfaceFormat format() const override;
+    bool isValid() const override;
+
+    QOpenGLFramebufferObject* buffer() const;
+    void setBuffer(QOpenGLFramebufferObject *buffer);
+
+private:
+    QOpenGLFramebufferObject *m_buffer;
+    QSurfaceFormat m_format;
+};
+
+#endif // UBUNTU_OFFSCREEN_SURFACE_H

=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2015-11-10 11:16:14 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2016-01-05 14:28:30 +0000
@@ -22,6 +22,7 @@
     input.cpp \
     integration.cpp \
     nativeinterface.cpp \
+    offscreensurface.cpp \
     platformservices.cpp \
     plugin.cpp \
     screen.cpp \
@@ -37,6 +38,7 @@
     integration.h \
     logging.h \
     nativeinterface.h \
+    offscreensurface.h \
     orientationchangeevent_p.h \
     platformservices.h \
     plugin.h \