Merge lp:~gerboland/qtubuntu/rasterGLSurface-fixes into lp:qtubuntu

[Gerry Boland]

Small BackingStore fixes: call makeCurrent on texture changes, and choose correct QImage format to avoid bit swizzling

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-08-24 12:40:30 +0000
+++ debian/control	2016-10-13 11:25:46 +0000
@@ -11,6 +11,7 @@
                libglib2.0-dev,
                libinput-dev,
                libmirclient-dev (>= 0.13.0),
+               libmirclient-debug-extension-dev,
                libmtdev-dev,
                libubuntu-application-api-dev (>= 2.9.0),
                libudev-dev,

=== modified file 'src/ubuntumirclient/backingstore.cpp'
--- src/ubuntumirclient/backingstore.cpp	2016-04-20 16:10:06 +0000
+++ src/ubuntumirclient/backingstore.cpp	2016-10-13 11:25:46 +0000
@@ -37,6 +37,7 @@
 
 UbuntuBackingStore::~UbuntuBackingStore()
 {
+    mContext->makeCurrent(window()); // needed as QOpenGLTexture destructor assumes current context
 }
 
 void UbuntuBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset)
@@ -52,7 +53,6 @@
         mBlitter->create();
 
     mBlitter->bind();
-    mBlitter->setSwizzleRB(true);
     mBlitter->blit(mTexture->textureId(), QMatrix4x4(), QOpenGLTextureBlitter::OriginTopLeft);
     mBlitter->release();
 
@@ -115,7 +115,9 @@
 
 void UbuntuBackingStore::resize(const QSize& size, const QRegion& /*staticContents*/)
 {
-    mImage = QImage(size, QImage::Format_RGB32);
+    mImage = QImage(size, QImage::Format_RGBA8888);
+
+    mContext->makeCurrent(window());
 
     if (mTexture->isCreated())
         mTexture->destroy();
@@ -125,3 +127,9 @@
 {
     return &mImage;
 }
+
+QImage UbuntuBackingStore::toImage() const
+{
+    // used by QPlatformBackingStore::composeAndFlush
+    return mImage;
+}

=== modified file 'src/ubuntumirclient/backingstore.h'
--- src/ubuntumirclient/backingstore.h	2014-11-11 14:34:12 +0000
+++ src/ubuntumirclient/backingstore.h	2016-10-13 11:25:46 +0000
@@ -34,6 +34,7 @@
     void flush(QWindow* window, const QRegion& region, const QPoint& offset) override;
     void resize(const QSize& size, const QRegion& staticContents) override;
     QPaintDevice* paintDevice() override;
+    QImage toImage() const override;
 
 protected:
     void updateTexture();

=== added file 'src/ubuntumirclient/debugextension.cpp'
--- src/ubuntumirclient/debugextension.cpp	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/debugextension.cpp	2016-10-13 11:25:46 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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 "debugextension.h"
+
+#include "logging.h"
+
+// mir client debug
+#include <mir_toolkit/debug/surface.h>
+
+Q_LOGGING_CATEGORY(ubuntumirclientDebug, "ubuntumirclient.debug")
+
+UbuntuDebugExtension::UbuntuDebugExtension()
+    : m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
+    , m_mapper(nullptr)
+{
+    qCDebug(ubuntumirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
+    m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_debug_surface_coords_to_screen");
+
+    if (!m_mirclientDebug.isLoaded()) {
+        qCWarning(ubuntumirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
+                                        << m_mirclientDebug.errorString();
+    } else if (!m_mapper) {
+        qCWarning(ubuntumirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
+                                        << m_mirclientDebug.errorString();
+    }
+}
+
+QPoint UbuntuDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)
+{
+    if (!m_mapper) {
+        return point;
+    }
+
+    QPoint mappedPoint;
+    bool status = m_mapper(surface, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
+    if (status) {
+        return mappedPoint;
+    } else {
+        return point;
+    }
+}

=== added file 'src/ubuntumirclient/debugextension.h'
--- src/ubuntumirclient/debugextension.h	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/debugextension.h	2016-10-13 11:25:46 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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_DEBUG_EXTENSION_H
+#define UBUNTU_DEBUG_EXTENSION_H
+
+#include <QPoint>
+#include <QLibrary>
+struct MirSurface;
+
+typedef bool (*MapperPrototype)(MirSurface* surface, int x, int y, int* screenX, int* screenY);
+
+
+class UbuntuDebugExtension
+{
+public:
+    UbuntuDebugExtension();
+
+    QPoint mapSurfacePointToScreen(MirSurface *, const QPoint &point);
+
+private:
+    QLibrary m_mirclientDebug;
+    MapperPrototype m_mapper;
+};
+
+#endif // UBUNTU_DEBUG_EXTENSION_H

=== added file 'src/ubuntumirclient/desktopwindow.cpp'
--- src/ubuntumirclient/desktopwindow.cpp	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/desktopwindow.cpp	2016-10-13 11:25:46 +0000
@@ -0,0 +1,26 @@
+/*
+ * 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 "desktopwindow.h"
+
+// local
+#include "logging.h"
+
+UbuntuDesktopWindow::UbuntuDesktopWindow(QWindow *window)
+    : QPlatformWindow(window)
+{
+    qCDebug(ubuntumirclient, "UbuntuDesktopWindow(window=%p)", window);
+}

=== added file 'src/ubuntumirclient/desktopwindow.h'
--- src/ubuntumirclient/desktopwindow.h	1970-01-01 00:00:00 +0000
+++ src/ubuntumirclient/desktopwindow.h	2016-10-13 11:25:46 +0000
@@ -0,0 +1,29 @@
+/*
+ * 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_DESKTOP_WINDOW_H
+#define UBUNTU_DESKTOP_WINDOW_H
+
+#include <qpa/qplatformwindow.h>
+
+// TODO Implement it. For now it's just an empty, dummy class.
+class UbuntuDesktopWindow : public QPlatformWindow
+{
+public:
+    UbuntuDesktopWindow(QWindow*);
+};
+
+#endif // UBUNTU_DESKTOP_WINDOW_H

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2016-08-17 15:32:38 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-10-13 11:25:46 +0000
@@ -74,8 +74,6 @@
 
 bool UbuntuOpenGLContext::makeCurrent(QPlatformSurface* surface)
 {
-    Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
-
     const bool ret = QEGLPlatformContext::makeCurrent(surface);
 
     if (Q_LIKELY(ret)) {

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-09-28 10:51:25 +0000
+++ src/ubuntumirclient/integration.cpp	2016-10-13 11:25:46 +0000
@@ -18,6 +18,8 @@
 #include "integration.h"
 #include "backingstore.h"
 #include "clipboard.h"
+#include "desktopwindow.h"
+#include "debugextension.h"
 #include "glcontext.h"
 #include "input.h"
 #include "logging.h"
@@ -29,6 +31,7 @@
 // Qt
 #include <QFileInfo>
 #include <QGuiApplication>
+#include <private/qeglpbuffer_p.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qplatforminputcontext.h>
@@ -70,7 +73,8 @@
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
 }
 
-UbuntuClientIntegration::UbuntuClientIntegration()
+
+UbuntuClientIntegration::UbuntuClientIntegration(int argc, char **argv)
     : QPlatformIntegration()
     , mNativeInterface(new UbuntuNativeInterface(this))
     , mFontDb(new QGenericUnixFontDatabase)
@@ -105,6 +109,17 @@
     mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
     ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
     ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
+
+    // Has debug mode been requsted, either with "-testability" switch or QT_LOAD_TESTABILITY env var
+    bool testability = qEnvironmentVariableIsSet("QT_LOAD_TESTABILITY");
+    for (int i=1; !testability && i<argc; i++) {
+        if (strcmp(argv[i], "-testability") == 0) {
+            testability = true;
+        }
+    }
+    if (testability) {
+        mDebugExtension.reset(new UbuntuDebugExtension);
+    }
 }
 
 void UbuntuClientIntegration::initialize()
@@ -211,21 +226,17 @@
 
 QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
 {
-    return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection);
+    if (window->type() == Qt::Desktop) {
+        // Desktop windows should not be backed up by a mir surface as they don't draw anything (nor should).
+        return new UbuntuDesktopWindow(window);
+    } else {
+        return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection, mDebugExtension.data());
+    }
 }
 
 bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
 {
     switch (cap) {
-    case ThreadedPixmaps:
-        return true;
-
-    case OpenGL:
-        return true;
-
-    case ApplicationState:
-        return true;
-
     case ThreadedOpenGL:
         if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
             return true;
@@ -233,8 +244,16 @@
             qCDebug(ubuntumirclient, "disabled threaded OpenGL");
             return false;
         }
+
+    case ThreadedPixmaps:
+    case OpenGL:
+    case ApplicationState:
     case MultipleWindows:
     case NonFullScreenWindows:
+#if QT_VERSION > QT_VERSION_CHECK(5, 5, 0)
+    case SwitchableWidgetComposition:
+#endif
+    case RasterGLSurface: // needed for QQuickWidget
         return true;
     default:
         return QPlatformIntegration::hasCapability(cap);

=== modified file 'src/ubuntumirclient/integration.h'
--- src/ubuntumirclient/integration.h	2016-08-24 12:40:30 +0000
+++ src/ubuntumirclient/integration.h	2016-10-13 11:25:46 +0000
@@ -29,6 +29,7 @@
 
 #include <EGL/egl.h>
 
+class UbuntuDebugExtension;
 class UbuntuInput;
 class UbuntuNativeInterface;
 class UbuntuScreen;
@@ -39,7 +40,7 @@
     Q_OBJECT
 
 public:
-    UbuntuClientIntegration();
+    UbuntuClientIntegration(int argc, char **argv);
     virtual ~UbuntuClientIntegration();
 
     // QPlatformIntegration methods.
@@ -64,6 +65,7 @@
     EGLDisplay eglDisplay() const { return mEglDisplay; }
     EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
     UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }
+    UbuntuDebugExtension *debugExtension() const { return mDebugExtension.data(); }
 
 private Q_SLOTS:
     void destroyScreen(UbuntuScreen *screen);
@@ -81,6 +83,7 @@
 
     UbuntuInput* mInput;
     QPlatformInputContext* mInputContext;
+    QScopedPointer<UbuntuDebugExtension> mDebugExtension;
     QScopedPointer<UbuntuScreenObserver> mScreenObserver;
     qreal mScaleFactor;
 

=== modified file 'src/ubuntumirclient/logging.h'
--- src/ubuntumirclient/logging.h	2016-06-22 17:16:33 +0000
+++ src/ubuntumirclient/logging.h	2016-10-13 11:25:46 +0000
@@ -26,5 +26,6 @@
 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)
 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)
+Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientDebug)
 
 #endif  // QUBUNTULOGGING_H

=== modified file 'src/ubuntumirclient/plugin.cpp'
--- src/ubuntumirclient/plugin.cpp	2015-12-04 16:19:33 +0000
+++ src/ubuntumirclient/plugin.cpp	2016-10-13 11:25:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 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
@@ -20,15 +20,9 @@
 
 Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)
 
-QStringList UbuntuMirClientIntegrationPlugin::keys() const
-{
-    QStringList list;
-    list << QStringLiteral("ubuntumirclient");
-    return list;
-}
-
-QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system,
-                                                               const QStringList &)
+QPlatformIntegration *UbuntuMirClientIntegrationPlugin::create(const QString &system,
+                                                               const QStringList &/*paramList*/,
+                                                               int &argc, char **argv)
 {
     if (system.toLower() == QLatin1String("ubuntumirclient")) {
 #ifdef PLATFORM_API_TOUCH
@@ -36,7 +30,7 @@
 #else
         setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
 #endif
-        return new UbuntuClientIntegration;
+        return new UbuntuClientIntegration(argc, argv);
     } else {
         return 0;
     }

=== modified file 'src/ubuntumirclient/plugin.h'
--- src/ubuntumirclient/plugin.h	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/plugin.h	2016-10-13 11:25:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 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
@@ -25,8 +25,7 @@
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json")
 
 public:
-    QStringList keys() const;
-    QPlatformIntegration* create(const QString&, const QStringList&);
+    QPlatformIntegration *create(const QString &system, const QStringList &paramList, int &argc, char **argv) override;
 };
 
 #endif // UBUNTU_CLIENT_PLUGIN_H

=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2016-09-28 10:51:25 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2016-10-13 11:25:46 +0000
@@ -18,6 +18,8 @@
     backingstore.cpp \
     clipboard.cpp \
     cursor.cpp \
+    debugextension.cpp \
+    desktopwindow.cpp \
     glcontext.cpp \
     input.cpp \
     integration.cpp \
@@ -33,6 +35,8 @@
     backingstore.h \
     clipboard.h \
     cursor.h \
+    debugextension.h \
+    desktopwindow.h \
     glcontext.h \
     input.h \
     integration.h \

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-09-28 10:33:40 +0000
+++ src/ubuntumirclient/window.cpp	2016-10-13 11:25:46 +0000
@@ -16,8 +16,10 @@
 
 // Local
 #include "window.h"
+#include "debugextension.h"
 #include "nativeinterface.h"
 #include "input.h"
+#include "integration.h"
 #include "screen.h"
 #include "logging.h"
 
@@ -600,13 +602,14 @@
 }
 
 UbuntuWindow::UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface *native,
-                           EGLDisplay eglDisplay, MirConnection *mirConnection)
+                           EGLDisplay eglDisplay, MirConnection *mirConnection, UbuntuDebugExtension *debugExt)
     : QObject(nullptr)
     , QPlatformWindow(w)
     , mId(makeId())
     , mWindowState(w->windowState())
     , mWindowFlags(w->flags())
     , mWindowVisible(false)
+    , mDebugExtention(debugExt)
     , mNativeInterface(native)
     , mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
     , mScale(1.0)
@@ -819,6 +822,15 @@
     return mSurface->format();
 }
 
+QPoint UbuntuWindow::mapToGlobal(const QPoint &pos) const
+{
+    if (mDebugExtention) {
+        return mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), pos);
+    } else {
+        return pos;
+    }
+}
+
 void* UbuntuWindow::eglSurface() const
 {
     return mSurface->eglSurface();

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2016-09-21 10:25:33 +0000
+++ src/ubuntumirclient/window.h	2016-10-13 11:25:46 +0000
@@ -27,6 +27,7 @@
 
 #include <EGL/egl.h>
 
+class UbuntuDebugExtension;
 class UbuntuNativeInterface;
 class UbuntuInput;
 class UbuntuScreen;
@@ -39,7 +40,7 @@
     Q_OBJECT
 public:
     UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,
-                 MirConnection *mirConnection);
+                 MirConnection *mirConnection, UbuntuDebugExtension *debugExt);
     virtual ~UbuntuWindow();
 
     // QPlatformWindow methods.
@@ -52,6 +53,7 @@
     void propagateSizeHints() override;
     bool isExposed() const override;
 
+    QPoint mapToGlobal(const QPoint &pos) const override;
     QSurfaceFormat format() const override;
 
     // Additional Window properties exposed by NativeInterface
@@ -79,6 +81,7 @@
     Qt::WindowFlags mWindowFlags;
     bool mWindowVisible;
     bool mWindowExposed;
+    UbuntuDebugExtension *mDebugExtention;
     UbuntuNativeInterface *mNativeInterface;
     std::unique_ptr<UbuntuSurface> mSurface;
     float mScale;