Merge lp:~hikiko/unity/unity.opt-when-no-blur into lp:unity

[Eleni Maria Stea]

shouldn't create blur rectangles when there's no blur, skips the blur rects processing in low gfx.

shouldn't create blur rectangles when there's no blur, skips the blur rects processing in low gfx.

[Eleni Maria Stea (hikiko)]

also renamed paintDisplay to paintOutput because the name is comfusing, it actually paints the Display/Output intersection.

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

Mh, I think you should instead return false at the beginning of UpdateOwnerGeometry()

[Eleni Maria Stea (hikiko)]

I thought of that TBH but we call the UpdateOwnerGeometry in other places too and I wasn't sure if I should change it. For example, there's this code in BackgroundEffectHelper:

  if (!UpdateOwnerGeometry())
  {
    DirtyCache();
    UpdateBlurGeometries();
  }

Do we want to dirty +updateBlurGeometries when the blending is disabled?
Since, I wasn't sure, I chose the change that affects less parts of the code..

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

Yeah, that's the reason... This way we can avoid these computations too... So please, go for it.

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

Can you please update this branch?

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

Ok, thanks!

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-11-28 23:40:15 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-12-12 08:28:26 +0000
@@ -863,7 +863,7 @@
   cScreen->damageRegion(CompRegionFromNuxGeo(blur_update));
 }
 
-void UnityScreen::paintDisplay()
+void UnityScreen::paintOutput()
 {
   CompOutput *output = last_output_;
 
@@ -1504,7 +1504,7 @@
     doShellRepaint = false;
 
   if (doShellRepaint)
-    paintDisplay();
+    paintOutput();
 
   return ret;
 }
@@ -3104,18 +3104,18 @@
 
   if (uScreen->doShellRepaint && window == uScreen->onboard_)
   {
-    uScreen->paintDisplay();
+    uScreen->paintOutput();
   }
   else if (uScreen->doShellRepaint &&
            window == uScreen->firstWindowAboveShell &&
            !uScreen->forcePaintOnTop() &&
            !uScreen->fullscreenRegion.contains(window->geometry()))
   {
-    uScreen->paintDisplay();
+    uScreen->paintOutput();
   }
   else if (locked && CanBypassLockScreen())
   {
-    uScreen->paintDisplay();
+    uScreen->paintOutput();
   }
 
   enum class DrawPanelShadow

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-09-01 23:56:24 +0000
+++ plugins/unityshell/src/unityshell.h	2016-12-12 08:28:26 +0000
@@ -180,7 +180,7 @@
   void nuxEpilogue();
 
   /* nux draw wrapper */
-  void paintDisplay();
+  void paintOutput();
   void paintPanelShadow(CompRegion const& clip);
   void setPanelShadowMatrix(const GLMatrix& matrix);
   void updateBlurDamage();

=== modified file 'unity-shared/BackgroundEffectHelper.cpp'
--- unity-shared/BackgroundEffectHelper.cpp	2016-07-01 17:58:24 +0000
+++ unity-shared/BackgroundEffectHelper.cpp	2016-12-12 08:28:26 +0000
@@ -147,6 +147,9 @@
 
 void BackgroundEffectHelper::UpdateBlurGeometries()
 {
+  if (blur_type == BLUR_NONE)
+      return;
+
   int radius = GetBlurRadius();
   blur_geometries_.clear();
   blur_geometries_.reserve(registered_list_.size());