Merge lp:~nick-dedekind/qtubuntu/lp1596524.use-pbuffers into lp:qtubuntu

[Nick Dedekind]

Use pbuffer for offscreen surfaces.

Use pbuffer for offscreen surfaces.

[Gerry Boland (gerboland)]

+ return static_cast<QEGLPbuffer *>(surface)->pbuffer();
bad indent

[Gerry Boland (gerboland)]

+ if (surface->surface()->surfaceClass() == QSurface::Window)
+ return static_cast<UbuntuWindow *>(surface)->eglSurface();
+ else {
+ return static_cast<QEGLPbuffer *>(surface)->pbuffer();
+ }
and you're mixing & matching brace/no-brace style. Braces please

review: Needs Fixing

[lp:~nick-dedekind/qtubuntu/lp1596524.use-pbuffers]

340. By Nick Dedekind on 2016-08-17

fixed coding style

341. By Nick Dedekind on 2016-08-17

added check for surface type

[Gerry Boland (gerboland)]

review: Approve (code)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:339
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/105/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2583
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2491
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2491
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2491
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2485/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2485
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2485/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/105/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:341
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/106/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2587
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2493
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2493
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2493
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2487/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2487/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/106/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Just tested on arale running rc-proposed, this appears to fix the issue I’m describing at https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1596524/comments/3.

[Gerry Boland (gerboland)]

I've tested this with my mako, flo, arale, krillin and desktop. No adverse behaviour detected.

review: Approve

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2016-08-09 23:00:32 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-08-17 15:32:47 +0000
@@ -16,11 +16,11 @@
 
 #include "glcontext.h"
 #include "logging.h"
-#include "offscreensurface.h"
 #include "window.h"
 
 #include <QOpenGLFramebufferObject>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtPlatformSupport/private/qeglpbuffer_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 
 Q_LOGGING_CATEGORY(ubuntumirclientGraphics, "ubuntumirclient.graphics", QtWarningMsg)
@@ -76,40 +76,35 @@
 {
     Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
 
-    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 {
-        const bool ret = QEGLPlatformContext::makeCurrent(surface);
-
-        if (Q_LIKELY(ret)) {
-            QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context());
-            if (!ctx_d->workaround_brokenFBOReadBack && needsFBOReadBackWorkaround()) {
-                ctx_d->workaround_brokenFBOReadBack = true;
-            }
-        }
-
-        return ret;
+    const bool ret = QEGLPlatformContext::makeCurrent(surface);
+
+    if (Q_LIKELY(ret)) {
+        QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context());
+        if (!ctx_d->workaround_brokenFBOReadBack && needsFBOReadBackWorkaround()) {
+            ctx_d->workaround_brokenFBOReadBack = true;
+        }
     }
+    return ret;
 }
 
 // Following method used internally in the base class QEGLPlatformContext to access
 // the egl surface of a QPlatformSurface/UbuntuWindow
 EGLSurface UbuntuOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
 {
-    auto ubuntuWindow = static_cast<UbuntuWindow *>(surface);
-    return ubuntuWindow->eglSurface();
+    if (surface->surface()->surfaceClass() == QSurface::Window) {
+        return static_cast<UbuntuWindow *>(surface)->eglSurface();
+    } else {
+        return static_cast<QEGLPbuffer *>(surface)->pbuffer();
+    }
 }
 
 void UbuntuOpenGLContext::swapBuffers(QPlatformSurface *surface)
 {
     QEGLPlatformContext::swapBuffers(surface);
 
-    // notify window on swap completion
-    auto ubuntuWindow = static_cast<UbuntuWindow *>(surface);
-    ubuntuWindow->onSwapBuffersDone();
+    if (surface->surface()->surfaceClass() == QSurface::Window) {
+        // notify window on swap completion
+        auto ubuntuWindow = static_cast<UbuntuWindow *>(surface);
+        ubuntuWindow->onSwapBuffersDone();
+    }
 }

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-06-22 17:07:57 +0000
+++ src/ubuntumirclient/integration.cpp	2016-08-17 15:32:47 +0000
@@ -22,7 +22,6 @@
 #include "input.h"
 #include "logging.h"
 #include "nativeinterface.h"
-#include "offscreensurface.h"
 #include "screen.h"
 #include "theme.h"
 #include "window.h"
@@ -36,7 +35,9 @@
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtPlatformSupport/private/qeglpbuffer_p.h>
 #include <QOpenGLContext>
+#include <QOffscreenSurface>
 
 // platform-api
 #include <ubuntu/application/lifecycle_delegate.h>
@@ -316,7 +317,7 @@
 QPlatformOffscreenSurface *UbuntuClientIntegration::createPlatformOffscreenSurface(
         QOffscreenSurface *surface) const
 {
-    return new UbuntuOffscreenSurface(surface);
+    return new QEGLPbuffer(mEglDisplay, surface->requestedFormat(), surface);
 }
 
 void UbuntuClientIntegration::destroyScreen(UbuntuScreen *screen)

=== removed file 'src/ubuntumirclient/offscreensurface.cpp'
--- src/ubuntumirclient/offscreensurface.cpp	2016-01-04 17:18:51 +0000
+++ src/ubuntumirclient/offscreensurface.cpp	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * 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;
-}

=== removed file 'src/ubuntumirclient/offscreensurface.h'
--- src/ubuntumirclient/offscreensurface.h	2016-01-04 17:18:51 +0000
+++ src/ubuntumirclient/offscreensurface.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * 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	2016-05-30 17:14:14 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2016-08-17 15:32:47 +0000
@@ -22,7 +22,6 @@
     input.cpp \
     integration.cpp \
     nativeinterface.cpp \
-    offscreensurface.cpp \
     platformservices.cpp \
     plugin.cpp \
     screen.cpp \
@@ -39,7 +38,6 @@
     integration.h \
     logging.h \
     nativeinterface.h \
-    offscreensurface.h \
     orientationchangeevent_p.h \
     platformservices.h \
     plugin.h \