Merge lp:~hikiko/unity/unity.tmp-fix-for-1602901 into lp:unity

[Eleni Maria Stea]

Reverts fix for multimonitor because of problems in nvidia cards (see bug: #1602901)

Reverts fix for multimonitor because of problems in nvidia cards (see bug: #1602901)

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-07-05 10:23:04 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-07-15 10:29:46 +0000
@@ -863,7 +863,7 @@
   cScreen->damageRegion(CompRegionFromNuxGeo(blur_update));
 }
 
-void UnityScreen::paintOutput()
+void UnityScreen::paintDisplay()
 {
   CompOutput *output = last_output_;
 
@@ -884,7 +884,7 @@
   current_draw_binding = old_read_binding;
 #endif
 
-  BackgroundEffectHelper::monitor_rect_.Set(0, 0, output->width(), output->height());
+  BackgroundEffectHelper::monitor_rect_.Set(0, 0, screen->width(), screen->height());
 
   // If we have dirty helpers re-copy the backbuffer into a texture
   if (dirty_helpers_on_this_frame_)
@@ -909,10 +909,10 @@
 
     for (CompRect const& rect : blur_region.rects())
     {
-      int x = nux::Clamp<int>(rect.x(), 0, output->width());
-      int y = nux::Clamp<int>(output->height() - rect.y2(), 0, output->height());
-      int width = std::min<int>(output->width() - rect.x(), rect.width());
-      int height = std::min<int>(output->height() - y, rect.height());
+      int x = nux::Clamp<int>(rect.x(), 0, screen->width());
+      int y = nux::Clamp<int>(screen->height() - rect.y2(), 0, screen->height());
+      int width = std::min<int>(screen->width() - rect.x(), rect.width());
+      int height = std::min<int>(screen->height() - y, rect.height());
 
       CHECKGL(glCopyTexSubImage2D(surface_target, 0, x, y, x, y, width, height));
     }
@@ -1504,7 +1504,7 @@
     doShellRepaint = false;
 
   if (doShellRepaint)
-    paintOutput();
+    paintDisplay();
 
   return ret;
 }
@@ -3094,18 +3094,18 @@
 
   if (uScreen->doShellRepaint && window == uScreen->onboard_)
   {
-    uScreen->paintOutput();
+    uScreen->paintDisplay();
   }
   else if (uScreen->doShellRepaint &&
            window == uScreen->firstWindowAboveShell &&
            !uScreen->forcePaintOnTop() &&
            !uScreen->fullscreenRegion.contains(window->geometry()))
   {
-    uScreen->paintOutput();
+    uScreen->paintDisplay();
   }
   else if (locked && CanBypassLockScreen())
   {
-    uScreen->paintOutput();
+    uScreen->paintDisplay();
   }
 
   enum class DrawPanelShadow
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-07-02 16:57:09 +0000
+++ plugins/unityshell/src/unityshell.h	2016-07-15 10:29:46 +0000
@@ -179,7 +179,7 @@
   void nuxEpilogue();
 
   /* nux draw wrapper */
-  void paintOutput();
+  void paintDisplay();
   void paintPanelShadow(CompRegion const& clip);
   void setPanelShadowMatrix(const GLMatrix& matrix);
   void updateBlurDamage();