reverted multimonitor fix because it causes problems in nvidia GPUs

(see bug: #1602901) (bzr r4151.1.1)

2 files changed, 11 insertions, 11 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index fb35b4886..eae3e412a 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -863,7 +863,7 @@ void UnityScreen::DamageBlurUpdateRegion(nux::Geometry const& blur_update)
 cScreen->damageRegion(CompRegionFromNuxGeo(blur_update));
 }
 
-void UnityScreen::paintOutput()
+void UnityScreen::paintDisplay()
 {
 CompOutput *output = last_output_;
 
@@ -884,7 +884,7 @@ void UnityScreen::paintOutput()
 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 @@ void UnityScreen::paintOutput()
 
 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 @@ bool UnityScreen::glPaintOutput(const GLScreenPaintAttrib& attrib,
 doShellRepaint = false;
 
 if (doShellRepaint)
- paintOutput();
+ paintDisplay();
 
 return ret;
 }
@@ -3094,18 +3094,18 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
 
 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
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 789e18aaf..b1dfda5b0 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -179,7 +179,7 @@ private:
 void nuxEpilogue();
 
 /* nux draw wrapper */
- void paintOutput();
+ void paintDisplay();
 void paintPanelShadow(CompRegion const& clip);
 void setPanelShadowMatrix(const GLMatrix& matrix);
 void updateBlurDamage();