Merge lp:~nick-dedekind/qtubuntu/occlusion-2.0 into lp:qtubuntu

[Nick Dedekind]

Re-added window exposure for occlusion detection

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/qtmir/occlusion-2.0/+merge/283197

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:308
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/4/
Executed test runs:

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

review: Approve (continuous-integration)

[lp:~nick-dedekind/qtubuntu/occlusion-2.0]

307. By Olivier Tilloy on 2016-01-28

Instantiate QKeyEvents with the scan code, native modifiers and native virtual key code, and special-case XKB_KEY_Return and XKB_KEY_KP_Enter to emit a carriage return character. Fixes: #1433138
Approved by: Lukáš Tinkl, PS Jenkins bot

308. By Daniel d'Andrada on 2016-02-02

Use logging categories and fix coding style (tab length)

So logging can be enabled/disabled at runtime instead of at build time
Approved by: Gerry Boland, PS Jenkins bot

309. By Daniel d'Andrada on 2016-02-02

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. Fixes: #1527737
Approved by: Gerry Boland, PS Jenkins bot

310. By CI Train Bot Account on 2016-02-02

Releasing 0.62+16.04.20160128.1-0ubuntu1

[Michael Terry (mterry)]

What's with the mNeedsExposeCatchup usage? If the window starts occluded, we do a one-time handleExposeEvent call? I'm sure it makes sense, I just don't understand the sequencing.

[Michael Terry (mterry)]

This has a merge conflict in src/ubuntumirclient/window.cpp it seems (though LP isn't showing it).

[Michael Terry (mterry)]

I tested this on the phone with the Music app:

QSG_RENDER_TIMING=1 QT_LOGGING_RULES="ubuntumirclient=true" qmlscene -qt5 /usr/share/click/preinstalled/com.ubuntu.music/current/app/music-app.qml --desktop_file_hint=/usr/share/click/preinstalled/com.ubuntu.music/current/com.ubuntu.music_music.desktop

Worked great! I want to try to do some testing with the Desktop stage, but I haven't noticed a regression like bug 1514556 yet.

[Michael Terry (mterry)]

Desktop mode seems to work fine.

But I get unity8 crashes if I flip between windowed and staged mode on my phone. They don't seem to be there without these branches.

gsettings set com.canonical.Unity8 usage-mode Staged
vs
gsettings set com.canonical.Unity8 usage-mode Windowed

I'm not sure what the exact trigger is. I had Music app playing music in the background, trying to render when it can. And some other windows, one was maximized. And I would just move them around, reorder them, and switch usage-modes. Got a crash a couple times that way.

Do you see that?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> Desktop mode seems to work fine.
>
> But I get unity8 crashes if I flip between windowed and staged mode on my
> phone. They don't seem to be there without these branches.
>
> gsettings set com.canonical.Unity8 usage-mode Staged
> vs
> gsettings set com.canonical.Unity8 usage-mode Windowed
>
> I'm not sure what the exact trigger is. I had Music app playing music in the
> background, trying to render when it can. And some other windows, one was
> maximized. And I would just move them around, reorder them, and switch usage-
> modes. Got a crash a couple times that way.
>
> Do you see that?

hm. supprised u8 crashes since this is mostly a qtubuntu change. I'll take a look.

[Nick Dedekind (nick-dedekind)]

> > Desktop mode seems to work fine.
> >
> > But I get unity8 crashes if I flip between windowed and staged mode on my
> > phone. They don't seem to be there without these branches.
> >
> > gsettings set com.canonical.Unity8 usage-mode Staged
> > vs
> > gsettings set com.canonical.Unity8 usage-mode Windowed
> >
> > I'm not sure what the exact trigger is. I had Music app playing music in
> the
> > background, trying to render when it can. And some other windows, one was
> > maximized. And I would just move them around, reorder them, and switch
> usage-
> > modes. Got a crash a couple times that way.
> >
> > Do you see that?
>
> hm. supprised u8 crashes since this is mostly a qtubuntu change. I'll take a
> look.

Can't seem to reproduce a crash. Could you please get me a stacktrace?

[Michael Terry (mterry)]

I had mentioned getting crashes earlier on IRC. But I had been using a poorly built version. Tried again with new build, but still get crashes.

I was toggling between Windowed and Staged modes and got lots of crashes in apps. Here are some stacktraces with just qtmir/qtubuntu symbols:
They all look roughly like (this one was from gallery-app) http://paste.ubuntu.com/15096134/

[Michael Terry (mterry)]

And here's one with some more symbols: http://paste.ubuntu.com/15096395/

[lp:~nick-dedekind/qtubuntu/occlusion-2.0]

311. By Nick Dedekind on 2016-03-22

Added support for low shell chrome Fixes: #1535397
Approved by: Gerry Boland, Unity8 CI Bot

312. By Lukáš Tinkl on 2016-03-22

Support for switching kbd layouts Fixes: #1491340, #1524400
Approved by: Unity8 CI Bot, Michael Terry, PS Jenkins bot

313. By CI Train Bot Account on 2016-03-22

Releasing 0.62+16.04.20160322-0ubuntu1

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

FAILED: Continuous integration, rev:308
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/29/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1131/console

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

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/qtubuntu/occlusion-2.0]

314. By Daniel d'Andrada on 2016-04-28

Proper support for multiple screens and dynamic scaling support Fixes: #1534682, #1573532
Approved by: Nick Dedekind, Unity8 CI Bot, Daniel d'Andrada, Gerry Boland

315. By Robert Bruce Park on 2016-04-28

Inline GLES packaging using a quilt patch.
Approved by: Unity8 CI Bot

316. By CI Train Bot Account on 2016-04-28

Releasing 0.62+16.04.20160428-0ubuntu1

317. By Albert Astals Cid on 2016-05-27

Enable workaround_brokenFBOReadBack on the Mali 400

Gives for impressive improvements in QSGDefaultDistanceFieldGlyphCache::storeGlyphs
impressive = 788ms -> 6ms
Approved by: Gerry Boland, Unity8 CI Bot

318. By Albert Astals Cid on 2016-05-27

Enable workaround_brokenFBOReadBack on the PowerVR Rogue G6200
Approved by: Gerry Boland, Unity8 CI Bot

319. By Albert Astals Cid on 2016-05-27

Enable workaround_brokenFBOReadBack on the Mali-T760
Approved by: Gerry Boland, Unity8 CI Bot

320. By Michael Terry on 2016-05-27

Build qtubuntu for arm64, and drop ancient qthybris transition package.

321. By CI Train Bot Account on 2016-05-27

Releasing 0.62+16.10.20160527.1-0ubuntu1

322. By Nick Dedekind on 2016-06-14

crossbuild support

323. By Nick Dedekind on 2016-06-14

added expose catchup

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-05-27 12:19:48 +0000
+++ debian/control	2016-06-14 10:49:38 +0000
@@ -15,7 +15,6 @@
                libudev-dev,
                libxkbcommon-dev,
                libxrender-dev,
-               qt5-default,
                qtbase5-private-dev,
                quilt,
 # if you don't have have commit access to this branch but would like to upload

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-05-27 13:03:49 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-06-14 10:49:38 +0000
@@ -1,14 +1,14 @@
-Index: arm64/debian/control
+Index: cross-build-support/debian/control
 ===================================================================
---- arm64.orig/debian/control
-+++ arm64/debian/control
+--- cross-build-support.orig/debian/control
++++ cross-build-support/debian/control
 @@ -1,4 +1,4 @@
 -Source: qtubuntu
 +Source: qtubuntu-gles
  Priority: optional
  Maintainer: Ubuntu Developers <[e-mail]>
  Build-Depends: debhelper (>= 9),
-@@ -11,12 +11,20 @@ Build-Depends: debhelper (>= 9),
+@@ -11,11 +11,20 @@ Build-Depends: debhelper (>= 9),
                 libinput-dev,
                 libmirclient-dev (>= 0.13.0),
                 libmtdev-dev,
@@ -22,15 +22,14 @@
                 libudev-dev,
                 libxkbcommon-dev,
                 libxrender-dev,
-                qt5-default,
--               qtbase5-private-dev,
+                qtbase5-private-dev,
 +               qtbase5-gles-dev,
 +               qtbase5-private-gles-dev,
 +               qtdeclarative5-dev,
                 quilt,
  # if you don't have have commit access to this branch but would like to upload
  # directly to Ubuntu, don't worry: your changes will be merged back into the
-@@ -26,7 +34,7 @@ Standards-Version: 3.9.6
+@@ -25,7 +34,7 @@ Standards-Version: 3.9.6
  Section: libs
  
  Package: qtubuntu-android
@@ -39,7 +38,7 @@
  Multi-Arch: same
  Conflicts: qtubuntu-desktop,
  Replaces: qtubuntu (<< 0.52),
-@@ -37,31 +45,12 @@ Provides: qtubuntu,
+@@ -36,31 +45,12 @@ Provides: qtubuntu,
  Depends: ubuntu-application-api3-touch,
           ${misc:Depends},
           ${shlibs:Depends},
@@ -74,37 +73,53 @@
 - This variant of the package is for GNU-based desktops.
 + This variant of the package is for Android-based phones and tablets (built
 + against the OpenGLES variant of qtbase).
-Index: arm64/debian/rules
+Index: cross-build-support/debian/rules
 ===================================================================
---- arm64.orig/debian/rules
-+++ arm64/debian/rules
-@@ -4,47 +4,25 @@
- export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+--- cross-build-support.orig/debian/rules
++++ cross-build-support/debian/rules
+@@ -5,60 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+ export QT_SELECT=5
  
  ANDROID_DIR = build-android
 -DESKTOP_DIR = build-desktop
  TMP1_DIR = $(CURDIR)/debian/tmp1
 -TMP2_DIR = $(CURDIR)/debian/tmp2
--
+ 
 -# We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
--DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ 
+ export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+ 
 -gles2_architectures = arm64 armhf
- 
+-
  %:
  	dh $@
  
  override_dh_clean:
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	rm -rf $(TMP1_DIR)
+-	rm -rf $(TMP1_DIR) $(DESKTOP_DIR)
 -endif
--	rm -rf $(TMP2_DIR)
+-	rm -rf $(TMP2_DIR) $(ANDROID_DIR)
++	rm -rf $(TMP1_DIR) $(ANDROID_DIR)
  	dh_clean
  
  override_dh_auto_configure:
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
--endif
--	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+ 	mkdir -p $(ANDROID_DIR)
+   ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
+ 	cd $(ANDROID_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+   else
+ 	dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+   endif
+-endif
+-	mkdir -p $(DESKTOP_DIR)
+-ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
+-	cd $(DESKTOP_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+-else
+-	dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+-endif
  
  override_dh_auto_build:
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
@@ -116,10 +131,8 @@
  	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
  	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
- 	cd $(CURDIR)
 -endif
 -	mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
--	cd $(CURDIR)
  
  override_dh_install:
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))

=== modified file 'debian/rules'
--- debian/rules	2016-05-27 13:01:34 +0000
+++ debian/rules	2016-06-14 10:49:38 +0000
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+export QT_SELECT=5
 
 ANDROID_DIR = build-android
 DESKTOP_DIR = build-desktop
@@ -10,6 +11,11 @@
 
 # We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+
 gles2_architectures = arm64 armhf
 
 %:
@@ -17,16 +23,26 @@
 
 override_dh_clean:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	rm -rf $(TMP1_DIR)
+	rm -rf $(TMP1_DIR) $(DESKTOP_DIR)
 endif
-	rm -rf $(TMP2_DIR)
+	rm -rf $(TMP2_DIR) $(ANDROID_DIR)
 	dh_clean
 
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
-endif
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+	mkdir -p $(ANDROID_DIR)
+  ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
+	cd $(ANDROID_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+  else
+	dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+  endif
+endif
+	mkdir -p $(DESKTOP_DIR)
+ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
+	cd $(DESKTOP_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+else
+	dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+endif
 
 override_dh_auto_build:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
@@ -38,10 +54,8 @@
 	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
-	cd $(CURDIR)
 endif
 	mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
-	cd $(CURDIR)
 
 override_dh_install:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-04-28 14:44:18 +0000
+++ src/ubuntumirclient/window.cpp	2016-06-14 10:49:38 +0000
@@ -280,6 +280,8 @@
         mMirSurface = createMirSurface(mWindow, mirOutputId, input, connection, surfaceEventCallback, this);
         mEglSurface = eglCreateWindowSurface(mEglDisplay, config, nativeWindowFor(mMirSurface), nullptr);
 
+        mNeedsExposeCatchup = mir_surface_get_visibility(mMirSurface) == mir_surface_visibility_occluded;
+
         // Window manager can give us a final size different from what we asked for
         // so let's check what we ended up getting
         MirSurfaceParameters parameters;
@@ -335,6 +337,8 @@
     void setSurfaceParent(MirSurface*);
     bool hasParent() const { return mParented; }
 
+    bool mNeedsExposeCatchup;
+
 private:
     static void surfaceEventCallback(MirSurface* surface, const MirEvent *event, void* context);
     void postEvent(const MirEvent *event);
@@ -562,6 +566,7 @@
     QMutexLocker lock(&mMutex);
     qCDebug(ubuntumirclient, "handleSurfaceExposeChange(window=%p, exposed=%s)", window(), exposed ? "true" : "false");
 
+    mSurface->mNeedsExposeCatchup = false;
     if (mWindowExposed == exposed) return;
     mWindowExposed = exposed;
 
@@ -728,6 +733,14 @@
 {
     QMutexLocker lock(&mMutex);
     mSurface->onSwapBuffersDone();
+
+    if (mSurface->mNeedsExposeCatchup) {
+        mSurface->mNeedsExposeCatchup = false;
+        mWindowExposed = false;
+
+        lock.unlock();
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
+    }
 }
 
 void UbuntuWindow::handleScreenPropertiesChange(MirFormFactor formFactor, float scale)