Merge lp:~3v1n0/gnome-shell/bionic-patches-picks-reorder into lp:~ubuntu-desktop/gnome-shell/ubuntu

[Marco Trevisan (Treviño)]

debian/patches/series: reorder patches, reimport xdg dir patch add GPU caching

Ideally I wanted to put them as first in the list, but then some don't apply anymore, so let's stick to this.

[lp:~3v1n0/gnome-shell/bionic-patches-picks-reorder]

146. By Marco Trevisan (Treviño) on 2018-04-18

debian/patches/ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch: actually cherry-pick from upstream

147. By Marco Trevisan (Treviño) on 2018-04-18

debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch: include duflu change

[Marco Trevisan (Treviño) (3v1n0)]

In the previous version I didn't properly cherry-picked the XDG dirs support patch

Plus added MP from Daniel

[Jeremy Bícha (jbicha)]

Sorry, it's late to be adding yet more patches to our patch queue.

The upstream comments on https://bugzilla.gnome.org/792633 were skeptical that this was the right thing to do in gnome-shell master itself. Therefore, I merged the other changes but not the js-ui-Choose-some-actors-to-cache-on-the-GPU.patch and uploaded to bionic now.

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-17 18:21:56 +0000
+++ debian/changelog	2018-04-18 07:28:06 +0000
@@ -30,6 +30,9 @@
     - Fix possible crash on cache loading
   * st-texture-cache-Don-t-add-NULL-textures-to-cache.patch:
     - Fix crash when deleting NULL textures from cache (LP: #1754445)
+  * js-ui-Choose-some-actors-to-cache-on-the-GPU.patch:
+    - Improve rendering of shell elements moving rendering to GPU
+      (LP: #1744001)
 
  -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 17 Apr 2018 14:40:17 -0400
 
 
=== added file 'debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch'
--- debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch	2018-04-18 07:28:06 +0000
@@ -0,0 +1,133 @@
+From: Daniel van Vugt <[e-mail]>
+Date: Fri, 6 Apr 2018 05:26:58 -0500
+Subject: js/ui: Choose some actors to cache on the GPU
+
+Adds a wrapper function to flag actors that are good candidates for
+caching in texture memory (what Clutter calls "offscreen redirect"),
+thereby mostly eliminating their repaint overhead.
+
+This isn't exactly groundbreaking, it's how you're meant to use
+OpenGL in the first place. But the difficulty is in the design of
+Clutter which has some peculiarities making universal caching
+inefficient at the moment:
+
+ * Repainting an offscreen actor is measurably slower than repainting
+   the same actor if it was uncached. But only by less than 100%,
+   so if an actor can avoid changing every frame then caching is usually
+   more efficient over that timeframe.
+
+ * The cached painting from a container typically includes its children,
+   so you can't cache containers whose children are usually animating at
+   full frame rate. That results in a performance loss.
+     This could be remedied in future by Clutter explicitly separating a
+   container's background painting from its child painting and always
+   caching the background (as StWidget tries to in some cases already).
+
+So this commit selects just a few areas where caching has been verified
+to be beneficial, and many use cases now see their CPU usage halved:
+
+One small window active...... 10% -> 7% (-30%)
+...under a panel menu........ 23% -> 9% (-61%)
+One maximized window active.. 12% -> 9% (-25%)
+...under a panel menu........ 23% -> 11% (-52%)
+...under a shell dialog...... 22% -> 12% (-45%)
+...in activities overview.... 32% -> 17% (-47%)
+(on an i7-7700)
+
+Also a couple of bugs are fixed by this:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=792634
+https://bugzilla.gnome.org/show_bug.cgi?id=792633
+
+Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792634
+Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792633
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1744001
+Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/73
+---
+ js/ui/boxpointer.js |  1 +
+ js/ui/dash.js       |  1 +
+ js/ui/dialog.js     |  2 ++
+ js/ui/main.js       | 16 ++++++++++++++++
+ js/ui/panel.js      |  1 +
+ 5 files changed, 21 insertions(+)
+
+diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
+index 47f718a..602646a 100644
+--- a/js/ui/boxpointer.js
++++ b/js/ui/boxpointer.js
+@@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({
+                                   y_fill: true });
+         this._container = new Shell.GenericContainer();
+         this.actor.set_child(this._container);
++        Main.hintActorSeldomChanges(this.actor);
+         this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this));
+         this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this));
+         this._container.connect('allocate', this._allocate.bind(this));
+diff --git a/js/ui/dash.js b/js/ui/dash.js
+index 5ee2476..14864f1 100644
+--- a/js/ui/dash.js
++++ b/js/ui/dash.js
+@@ -402,6 +402,7 @@ var Dash = new Lang.Class({
+                                        clip_to_allocation: true });
+         this._box._delegate = this;
+         this._container.add_actor(this._box);
++        Main.hintActorSeldomChanges(this._container);
+ 
+         this._showAppsIcon = new ShowAppsIcon();
+         this._showAppsIcon.childScale = 1;
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index cfa192d..89db963 100644
+--- a/js/ui/dialog.js
++++ b/js/ui/dialog.js
+@@ -6,6 +6,7 @@ const GObject = imports.gi.GObject;
+ const Pango = imports.gi.Pango;
+ const St = imports.gi.St;
+ const Lang = imports.lang;
++const Main = imports.ui.main;
+ 
+ var Dialog = new Lang.Class({
+     Name: 'Dialog',
+@@ -40,6 +41,7 @@ var Dialog = new Lang.Class({
+         // mode accordingly so wrapped labels are handled correctly during
+         // size requests.
+         this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
++        Main.hintActorSeldomChanges(this._dialog);
+ 
+         this.contentLayout = new St.BoxLayout({ vertical: true,
+                                                 style_class: "modal-dialog-content-box" });
+diff --git a/js/ui/main.js b/js/ui/main.js
+index d86cf9e..5277cf7 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -716,3 +716,19 @@ function showRestartMessage(message) {
+     let restartMessage = new RestartMessage(message);
+     restartMessage.open();
+ }
++
++/**
++ * hintActorSeldomChanges:
++ * @actor: A clutter actor
++ *
++ * Flag an actor as known to not need repainting very often. Such actors can
++ * have their painting cached in GPU memory so that future repaints triggered
++ * by other actors don't incur a repaint of @actor. This can provide dramatic
++ * performance benefits if used wisely.
++ *
++ * This hint needs to be provided manually because clutter presently lacks
++ * a good enough heuristic to toggle the optimization automatically.
++ */
++function hintActorSeldomChanges(actor) {
++    actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
++}
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index 2f59324..2237ead 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -772,6 +772,7 @@ var Panel = new Lang.Class({
+         this.actor = new Shell.GenericContainer({ name: 'panel',
+                                                   reactive: true });
+         this.actor._delegate = this;
++        Main.hintActorSeldomChanges(this.actor);
+ 
+         this._sessionStyle = null;
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2018-04-17 10:25:59 +0000
+++ debian/patches/series	2018-04-18 07:28:06 +0000
@@ -11,16 +11,19 @@
 ubuntu_background_login.patch
 ubuntu_gdm_alternatives.patch
 ubuntu_block_mode_extension_update.patch
+# Cherry picks from upstream
 ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch
-workaround_crasher_fractional_scaling.patch
-shell-ignore-invalid-window-monitor-index.patch
 workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
 workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
 workspaceThumbnail-initialize-porthole-based-on-workArea.patch
 popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
+volume-Add-back-sound-feedback-on-scroll.patch
+# End of Cherry-picked patches
+workaround_crasher_fractional_scaling.patch
+shell-ignore-invalid-window-monitor-index.patch
 StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
-volume-Add-back-sound-feedback-on-scroll.patch
 js-fix-invalid-access-errors.patch
 workspace-fix-repositioned-windows-in-activities.patch
 st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 st-texture-cache-Don-t-add-NULL-textures-to-cache.patch
+js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 
=== modified file 'debian/patches/ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch'
--- debian/patches/ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch	2018-04-17 18:09:32 +0000
+++ debian/patches/ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch	2018-04-18 07:28:06 +0000
@@ -1,34 +1,38 @@
-Description: ui: Theme lookup should respect XDG_DATA_DIRS
- mods, extensions and others GNOME Shell assets lookup into each dir, relative
- to XDG_DATA_DIRS. However, this isn't the case for themes (which can be
- referenced by a mod in a different XDG_DATA_DIR), hardcoding global.datadir.
- The fix is to have the theme finding pattern following the same logic than
- other elements.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1760039
-Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/70
-Author: Didier Roche <[e-mail]>
+From: Didier Roche <[e-mail]>
+Date: Fri, 30 Mar 2018 01:44:14 -0600
+Subject: ui: Theme lookup should respect XDG_DATA_DIRS
+
+Modes, extensions and other GNOME Shell assets are searched in appropriate
+subdirectories of each directory in XDG_DATA_DIRS, falling back
+to global.datadir.
+However, this isn't the case for themes, which are currently always expected
+in global.datadir, even when referenced by a mode in a different XDG_DATA_DIR.
+
+The fix is to have the theme finding pattern follow the same logic as other
+elements.
+Fixes #167.
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/d6d09fd
+---
+ js/ui/main.js | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
 diff --git a/js/ui/main.js b/js/ui/main.js
-index 7c1214e0a..99edd28d7 100644
+index 2cfe941..d86cf9e 100644
 --- a/js/ui/main.js
 +++ b/js/ui/main.js
-@@ -254,9 +254,14 @@ function _getStylesheet(name) {
+@@ -256,6 +256,14 @@ function _getStylesheet(name) {
      if (stylesheet.query_exists(null))
          return stylesheet;
  
--    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
--    if (stylesheet.query_exists(null))
--        return stylesheet;
 +    let dataDirs = GLib.get_system_data_dirs();
 +    for (let i = 0; i < dataDirs.length; i++) {
 +        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]);
 +        let stylesheet = Gio.file_new_for_path(path);
-+        if (stylesheet.query_exists(null)) {
++        if (stylesheet.query_exists(null))
 +            return stylesheet;
-+        }
 +    }
- 
-     return null;
- }
--- 
-2.15.1
-
++
+     stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
+     if (stylesheet.query_exists(null))
+         return stylesheet;