summaryrefslogtreecommitdiff
path: root/plugins
diff options
authorEleni Maria Stea <elenimaria.stea@canonical.com>2017-01-09 15:08:57 +0000
committerBileto Bot <ci-train-bot@canonical.com>2017-01-09 15:08:57 +0000
commit7dc35711b556d2ba863e5eb61ccc153600b1a36a (patch)
tree921e3e5024fa7edf471867d1cd3fdbedba2d11f1 /plugins
parentc9ea395d1e6218fbd709fa32256a03b3905efafc (diff)
parenta47108fb79f69c7d0d9eb5e94a0a2138f1667968 (diff)
shouldn't create blur rectangles when there's no blur, skips the blur rects processing in low gfx.
Approved by: Marco Trevisan (TreviƱo) (bzr r4214)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/unityshell/src/unityshell.cpp10
-rw-r--r--plugins/unityshell/src/unityshell.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index c08c44f83..05284b483 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::paintDisplay()
+void UnityScreen::paintOutput()
{
CompOutput *output = last_output_;
@@ -1504,7 +1504,7 @@ bool UnityScreen::glPaintOutput(const GLScreenPaintAttrib& attrib,
doShellRepaint = false;
if (doShellRepaint)
- paintDisplay();
+ paintOutput();
return ret;
}
@@ -3104,18 +3104,18 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
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
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 43df66e72..84c3bdcca 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -180,7 +180,7 @@ private:
void nuxEpilogue();
/* nux draw wrapper */
- void paintDisplay();
+ void paintOutput();
void paintPanelShadow(CompRegion const& clip);
void setPanelShadowMatrix(const GLMatrix& matrix);
void updateBlurDamage();