Merge lp:~3v1n0/unity/callgrind-improvements into lp:unity

[Marco Trevisan (Treviño)]

Unity: reduce a lot the cost of some many-often called functions, thanks to callgrind

UnityScreen::nuxEpilogue: -38.3%
IconRenderer::RenderElement: -5.8%
Launcher::DrawContent: -58.6%
panel::Controller::GetTrayXids: -100%
UnityScreen::nuxDamageCompiz: -70%
IconRenderer::PreprocessIcons: -74.3%
UnityScreen::nuxPrologue: -36.9%
IconRenderer::UpdateIconTransform: -87.7%
UnityScreen::paintPanelShadow: -64.3%
dash::LensView::OnResultAdded: -84.6%
IconTexture::GetTransform: -89.4%

See more at http://i.imgur.com/VHrthtt.png

Comparing these Callgrind results http://ubuntuone.com/1sSpDSF3Nljqbp5UuCI4h3 we get these improvements:

UnityScreen::nuxEpilogue: -38.3%
IconRenderer::RenderElement: -5.8%
Launcher::DrawContent: -58.6%
panel::Controller::GetTrayXids: -100%
UnityScreen::nuxDamageCompiz: -70%
IconRenderer::PreprocessIcons: -74.3%
UnityScreen::nuxPrologue: -36.9%
IconRenderer::UpdateIconTransform: -87.7%
UnityScreen::paintPanelShadow: -64.3%
dash::LensView::OnResultAdded: -84.6%
IconTexture::GetTransform: -89.4%

Plus other more generic operations such as vectors allocations or matrix operations.

All these are possible in combination with lp:~3v1n0/nux/callgrind-improvements

[Andrea Azzarone (azzar1)]

+ nux::Point3 rotation;

Why did you do it?

review: Needs Information

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

> + nux::Point3 rotation;
>
> Why did you do it?

We had 3 floats instead that needed manual initialization (both in renderer and in Launcher), and that didn't allow to do equality check easily (in PreprocessIcon).
Using a nux::Point3 is just smarter and allows to do the same things better.

[Brandon Schaefer (brandontschaefer)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/572/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/572/console

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

> > + nux::Point3 rotation;
> >
> > Why did you do it?
>
> We had 3 floats instead that needed manual initialization (both in renderer
> and in Launcher), and that didn't allow to do equality check easily (in
> PreprocessIcon).
> Using a nux::Point3 is just smarter and allows to do the same things better.

What about a nux::Vector3(?) rotation?

[Andrea Azzarone (azzar1)]

LGTM now. Thanks!!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/573/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/573/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/573/console

review: Needs Fixing (continuous-integration)

[Adrian Wechner (adrian-wechner)]

197 + result.rotation.x = start.rotation.x + (end.rotation.x - start.rotation.x) * progress;
198 + result.rotation.y = start.rotation.y + (end.rotation.y - start.rotation.y) * progress;
199 + result.rotation.z = start.rotation.z + (end.rotation.z - start.rotation.z) * progress;

This could be shorten by:
basically what you do is +val1 + val2 - val1 => well val1 would then be 0
(maybe the compiler would optimize that anyway)

result.rotation.x = end.rotation.x * progress;
result.rotation.y = end.rotation.y * progress;
result.rotation.z = end.rotation.z * progress;

doesn't it?

[Adrian Wechner (adrian-wechner)]

if you use 2 * M_PI a lot (i don't know if you do) and if M_PI is a constant, then I'd add another constant M2_PI (or something like that). then you would save a float operation :)

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

Adrian, thanks for pointing that out... I didn't change a lot that part of code as I focused on things that were stealing more cycles (also, thankfully g++ is quite good at optimizing).

Anyway, it would be nice to improve these things too (old code)... Would you be so kind to do a merge proposal? :)

[Adrian Wechner (adrian-wechner)]

what you mean with a merge proposal? to create a branch, change what I meant and then to propose to merge into this branch? if it is, then tomorrow i'll do that with pleasure.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3307
http://jenkins.qa.ubuntu.com/job/unity-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Adrian Wechner (adrian-wechner)]

forget about what I said. the shorten does not work... sorry, it's just too late to think clear :) we add start after we multiplied, so that just works how it is. and i checked the M_PI constant. you don't use it that often and only once multiplied by 2.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/2/console

review: Needs Fixing (continuous-integration)

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

No need to retry this branch, it won't merge until the nux queue is cleared (and the merger seems to have some issues with that) as for the version bump there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3307
http://jenkins.qa.ubuntu.com/job/unity-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/3

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2013-01-15 21:53:55 +0000
+++ dash/LensView.cpp	2013-04-12 23:35:32 +0000
@@ -225,11 +225,6 @@
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);
 
-  scroll_view_->geometry_changed.connect([this] (nux::Area *area, nux::Geometry& geo)
-  {
-    CheckScrollBarState();
-  });
-
   scroll_layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
   scroll_view_->SetLayout(scroll_layout_);
   scroll_view_->SetRightArea(show_filters);
@@ -510,8 +505,7 @@
     std::string uri = result.uri;
     LOG_TRACE(logger) << "Result added: " << uri;
 
-    counts_[group]++;
-    UpdateCounts(group);
+    UpdateCounts(group, ++counts_[group]);
     // make sure we don't display the no-results-hint if we do have results
     if (G_UNLIKELY (no_results_active_))
     {
@@ -543,8 +537,7 @@
     std::string uri = result.uri;
     LOG_TRACE(logger) << "Result removed: " << uri;
 
-    counts_[group]--;
-    UpdateCounts(group);
+    UpdateCounts(group, --counts_[group]);
   } catch (std::out_of_range& oor) {
     LOG_WARN(logger) << "Result does not have a valid category index: "
                      << boost::lexical_cast<unsigned int>(result.category_index)
@@ -552,13 +545,13 @@
   }
 }
 
-void LensView::UpdateCounts(PlacesGroup* group)
+void LensView::UpdateCounts(PlacesGroup* group, unsigned int new_counts)
 {
   unsigned int columns = dash::Style::Instance().GetDefaultNColumns();
   columns -= filters_expanded ? 2 : 0;
 
-  group->SetCounts(columns, counts_[group]);
-  group->SetVisible(counts_[group]);
+  group->SetCounts(columns, new_counts);
+  group->SetVisible(new_counts);
 }
 
 void LensView::CheckNoResults(Lens::Hints const& hints)
@@ -663,13 +656,13 @@
 
 void LensView::CheckScrollBarState()
 {
-  if (scroll_layout_->GetGeometry().height > scroll_view_->GetGeometry().height)
+  if (scroll_layout_->GetHeight() > scroll_view_->GetHeight())
   {
-    scroll_view_->EnableVerticalScrollBar(true); 
+    scroll_view_->EnableVerticalScrollBar(true);
   }
   else
   {
-    scroll_view_->EnableVerticalScrollBar(false); 
+    scroll_view_->EnableVerticalScrollBar(false);
   }
 }
 
@@ -735,6 +728,7 @@
 {
   nux::Geometry const& geo(GetGeometry());
   graphics_engine.PushClippingRectangle(geo);
+  CheckScrollBarState();
 
   if (!IsFullRedraw() && RedirectedAncestor())
   {

=== modified file 'dash/LensView.h'
--- dash/LensView.h	2012-12-17 21:30:27 +0000
+++ dash/LensView.h	2013-04-12 23:35:32 +0000
@@ -97,7 +97,7 @@
   void OnCategoryOrderChanged();
   void OnResultAdded(Result const& result);
   void OnResultRemoved(Result const& result);
-  void UpdateCounts(PlacesGroup* group);
+  void UpdateCounts(PlacesGroup* group, unsigned int);
   void OnGroupExpanded(PlacesGroup* group);
   void CheckScrollBarState();
   void OnColumnsChanged();

=== modified file 'debian/control'
--- debian/control	2013-03-06 10:42:08 +0000
+++ debian/control	2013-04-12 23:35:32 +0000
@@ -28,7 +28,7 @@
                libunity-misc-dev (>= 4.0.4),
                libgrail-dev (>= 1.0.20),
                libxcb-icccm4-dev,
-               libnux-4.0-dev (>= 4.0.0daily13.01.18bzr752),
+               libnux-4.0-dev (>= 4.0.1),
                compiz-dev (>= 1:0.9.9~daily13.01.25bzr3586),
                libcompizconfig0-dev (>= 1:0.9.9~daily12.12.05-0ubuntu2),
                xsltproc,

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-04-09 02:18:08 +0000
+++ launcher/Launcher.cpp	2013-04-12 23:35:32 +0000
@@ -150,6 +150,7 @@
   , icon_renderer(std::make_shared<ui::IconRenderer>())
 {
   m_Layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+  icon_renderer->monitor = monitor();
 
   bg_effect_helper_.owner = this;
   bg_effect_helper_.enabled = false;
@@ -783,9 +784,6 @@
   arg.running_colored     = icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT);
   arg.draw_edge_only      = IconDrawEdgeOnly(icon);
   arg.active_colored      = false;
-  arg.x_rotation          = 0.0f;
-  arg.y_rotation          = 0.0f;
-  arg.z_rotation          = 0.0f;
   arg.skip                = false;
   arg.stick_thingy        = false;
   arg.keyboard_nav_hl     = false;
@@ -863,7 +861,7 @@
 
   if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT) && options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
   {
-    arg.z_rotation = IconUrgentWiggleValue(icon, current);
+    arg.rotation.z = IconUrgentWiggleValue(icon, current);
   }
 
   if (IsInKeyNavMode())
@@ -941,7 +939,7 @@
 
   // icon is crossing threshold, start folding
   center.z += folded_z_distance * folding_progress;
-  arg.x_rotation = animation_neg_rads * folding_progress;
+  arg.rotation.x = animation_neg_rads * folding_progress;
 
   float spacing_overlap = CLAMP((float)(center.y + (2.0f * half_size * size_modifier) + (_space_between_icons * size_modifier) - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
   float spacing = (_space_between_icons * (1.0f - spacing_overlap) + folded_spacing * spacing_overlap) * size_modifier;
@@ -1399,6 +1397,7 @@
   unity::panel::Style &panel_style = panel::Style::Instance();
   Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_style.panel_height),
          monitor_geo.height - panel_style.panel_height);
+  icon_renderer->monitor = new_monitor;
 }
 
 void Launcher::UpdateOptions(Options::Ptr options)
@@ -1688,8 +1687,6 @@
 
 void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
-  icon_renderer->monitor = monitor();
-
   nux::Geometry const& base = GetGeometry();
   nux::Geometry bkg_box;
   std::list<RenderArg> args;
@@ -2458,7 +2455,7 @@
   SetupRenderArg(icon, current, arg);
   arg.render_center = nux::Point3(roundf(texture->GetWidth() / 2.0f), roundf(texture->GetHeight() / 2.0f), 0.0f);
   arg.logical_center = arg.render_center;
-  arg.x_rotation = 0.0f;
+  arg.rotation.x = 0.0f;
   arg.running_arrow = false;
   arg.active_arrow = false;
   arg.skip = false;

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-02-13 01:45:00 +0000
+++ launcher/SwitcherView.cpp	2013-04-12 23:35:32 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "config.h"
+#include "MultiMonitor.h"
 #include "SwitcherView.h"
 #include "unity-shared/IconRenderer.h"
 #include "unity-shared/TimeUtil.h"
@@ -57,6 +58,7 @@
   , target_sizes_set_(false)
 {
   icon_renderer_->pip_style = OVER_TILE;
+  icon_renderer_->monitor = max_num_monitors;
 
   text_view_->SetMaximumWidth(tile_size * spread_size);
   text_view_->SetLines(1);
@@ -224,9 +226,9 @@
 
   RenderArg result = end;
 
-  result.x_rotation = start.x_rotation + (end.x_rotation - start.x_rotation) * progress;
-  result.y_rotation = start.y_rotation + (end.y_rotation - start.y_rotation) * progress;
-  result.z_rotation = start.z_rotation + (end.z_rotation - start.z_rotation) * progress;
+  result.rotation.x = start.rotation.x + (end.rotation.x - start.rotation.x) * progress;
+  result.rotation.y = start.rotation.y + (end.rotation.y - start.rotation.y) * progress;
+  result.rotation.z = start.rotation.z + (end.rotation.z - start.rotation.z) * progress;
 
   result.render_center.x = start.render_center.x + (end.render_center.x - start.render_center.x) * progress;
   result.render_center.y = start.render_center.y + (end.render_center.y - start.render_center.y) * progress;
@@ -489,7 +491,7 @@
 
       x += (half_size + flat_spacing) * scalar;
 
-      arg.y_rotation = (1.0f - MIN (1.0f, scalar));
+      arg.rotation.y = (1.0f - std::min<float>(1.0f, scalar));
 
       if (!should_flat && overflow > 0 && i != selection)
       {
@@ -500,11 +502,11 @@
         else
         {
           arg.render_center.x += 20;
-          arg.y_rotation = -arg.y_rotation;
+          arg.rotation.y = -arg.rotation.y;
         }
       }
 
-      arg.render_center.z = abs(80.0f * arg.y_rotation);
+      arg.render_center.z = abs(80.0f * arg.rotation.y);
       arg.logical_center = arg.render_center;
 
       if (i == selection && detail_selection)
@@ -588,13 +590,13 @@
       text_view_->SetBaseX(start_x);
     }
 
-    if (arg.y_rotation < 0)
+    if (arg.rotation.y < 0)
       icon_renderer_->RenderIcon(GfxContext, arg, base, base);
   }
 
   for (auto rit = last_args_.rbegin(); rit != last_args_.rend(); ++rit)
   {
-    if (rit->y_rotation >= 0)
+    if (rit->rotation.y >= 0)
       icon_renderer_->RenderIcon(GfxContext, *rit, base, base);
   }
 

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2013-04-09 01:35:49 +0000
+++ panel/PanelController.cpp	2013-04-12 23:35:32 +0000
@@ -44,7 +44,6 @@
   void FirstMenuShow();
   void QueueRedraw();
 
-  std::vector<Window> GetTrayXids() const;
   std::vector<nux::View*> GetPanelViews() const;
   std::vector<nux::Geometry> GetGeometries() const;
 
@@ -60,7 +59,6 @@
 
   void OnScreenChanged(unsigned int primary_monitor, std::vector<nux::Geometry>& monitors, Introspectable *iobj);
 
-private:
   typedef nux::ObjectPtr<nux::BaseWindow> BaseWindowPtr;
 
   unity::PanelView* ViewForWindow(BaseWindowPtr const& window) const;
@@ -70,8 +68,8 @@
                                       nux::Geometry& geo,
                                       void*          user_data);
 
-private:
   std::vector<BaseWindowPtr> windows_;
+  std::vector<Window> tray_xids_;
   float opacity_;
   bool opacity_maximized_toggle_;
   int menus_fadein_;
@@ -94,23 +92,11 @@
   , dbus_indicators_(std::make_shared<indicator::DBusIndicators>())
 {}
 
-std::vector<Window> Controller::Impl::GetTrayXids() const
-{
-  std::vector<Window> xids;
-
-  for (auto window: windows_)
-  {
-    xids.push_back(ViewForWindow(window)->GetTrayXid());
-  }
-
-  return xids;
-}
-
 std::vector<nux::View*> Controller::Impl::GetPanelViews() const
 {
   std::vector<nux::View*> views;
   views.reserve(windows_.size());
-  for (auto window: windows_)
+  for (auto const& window: windows_)
     views.push_back(ViewForWindow(window));
   return views;
 }
@@ -119,7 +105,7 @@
 {
   std::vector<nux::Geometry> geometries;
 
-  for (auto window : windows_)
+  for (auto const& window : windows_)
   {
     geometries.push_back(window->GetAbsoluteGeometry());
   }
@@ -129,7 +115,7 @@
 
 void Controller::Impl::FirstMenuShow()
 {
-  for (auto window: windows_)
+  for (auto const& window: windows_)
   {
     if (ViewForWindow(window)->FirstMenuShow())
       break;
@@ -140,7 +126,7 @@
 {
   opacity_ = opacity;
 
-  for (auto window: windows_)
+  for (auto const& window: windows_)
   {
     ViewForWindow(window)->SetOpacity(opacity_);
   }
@@ -158,7 +144,7 @@
 {
   opacity_maximized_toggle_ = enabled;
 
-  for (auto window: windows_)
+  for (auto const& window: windows_)
   {
     ViewForWindow(window)->SetOpacityMaximizedToggle(opacity_maximized_toggle_);
   }
@@ -173,7 +159,7 @@
   menus_discovery_fadein_ = discovery_fadein;
   menus_discovery_fadeout_ = discovery_fadeout;
 
-  for (auto window: windows_)
+  for (auto const& window: windows_)
   {
     ViewForWindow(window)->SetMenuShowTimings(fadein, fadeout, discovery,
                                               discovery_fadein, discovery_fadeout);
@@ -182,7 +168,7 @@
 
 void Controller::Impl::QueueRedraw()
 {
-  for (auto window: windows_)
+  for (auto const& window: windows_)
   {
     window->QueueDraw();
   }
@@ -205,6 +191,8 @@
   unsigned n_monitors = monitors.size();
   unsigned int i = 0;
 
+  tray_xids_.resize(n_monitors);
+
   for (it = windows_.begin(); it != windows_.end(); ++it)
   {
     if (i < n_monitors)
@@ -222,6 +210,7 @@
       view = ViewForWindow(*it);
       view->SetPrimary(i == primary_monitor);
       view->SetMonitor(i);
+      tray_xids_[i] = view->GetTrayXid();
 
       if (nux::GetWindowThread()->IsEmbeddedWindow())
       {
@@ -252,6 +241,7 @@
                                menus_discovery_fadein_, menus_discovery_fadeout_);
       view->SetPrimary(i == primary_monitor);
       view->SetMonitor(i);
+      tray_xids_[i] = view->GetTrayXid();
 
       layout->AddView(view, 1);
       layout->SetContentDistribution(nux::MAJOR_POSITION_START);
@@ -362,9 +352,9 @@
   pimpl->QueueRedraw();
 }
 
-std::vector<Window> Controller::GetTrayXids() const
+std::vector<Window> const& Controller::GetTrayXids() const
 {
-  return pimpl->GetTrayXids();
+  return pimpl->tray_xids_;
 }
 
 std::vector<nux::View*> Controller::GetPanelViews() const

=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2013-01-30 19:00:01 +0000
+++ panel/PanelController.h	2013-04-12 23:35:32 +0000
@@ -40,7 +40,7 @@
   void FirstMenuShow();
   void QueueRedraw();
 
-  std::vector<Window> GetTrayXids() const;
+  std::vector<Window> const& GetTrayXids() const;
   std::vector<nux::View*> GetPanelViews() const;
   std::vector<nux::Geometry> GetGeometries() const;
 

=== modified file 'panel/PanelTray.cpp'
--- panel/PanelTray.cpp	2013-02-06 12:32:28 +0000
+++ panel/PanelTray.cpp	2013-04-12 23:35:32 +0000
@@ -89,7 +89,7 @@
 
 Window PanelTray::xid()
 {
-  if (!window_)
+  if (!window_ || !gtk_widget_get_realized(window_))
     return 0;
 
   return gdk_x11_window_get_xid(gtk_widget_get_window(window_));

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-11 05:53:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-04-12 23:35:32 +0000
@@ -621,8 +621,6 @@
 
   panelShadowPainted |= redraw;
 
-  nuxPrologue();
-
   for (auto const& r : redraw.rects())
   {
     for (GLTexture* tex : _shadow_texture)
@@ -685,7 +683,6 @@
         glDisable(GL_BLEND);
     }
   }
-  nuxEpilogue();
 }
 
 void
@@ -1434,8 +1431,7 @@
    *       redraw even though the launcher's geometry is not in DrawList, and
    *       stop it. Then maybe we can revert back to the old code below #else.
    */
-  std::vector<nux::Geometry> const& dirty = wt->GetDrawList();
-  if (!dirty.empty() || animation_controller_->HasRunningAnimations())
+  if (!wt->GetDrawList().empty() || animation_controller_->HasRunningAnimations())
   {
     cScreen->damageRegionSetEnabled(this, false);
     cScreen->damageScreen();

=== modified file 'unity-shared/AbstractIconRenderer.h'
--- unity-shared/AbstractIconRenderer.h	2012-10-17 22:42:12 +0000
+++ unity-shared/AbstractIconRenderer.h	2013-04-12 23:35:32 +0000
@@ -41,9 +41,6 @@
   RenderArg()
     : icon(0)
     , colorify(nux::color::White)
-    , x_rotation(0)
-    , y_rotation(0)
-    , z_rotation(0)
     , alpha(1.0f)
     , saturation(1.0f)
     , backlight_intensity(0.0f)
@@ -71,10 +68,8 @@
   IconTextureSource* icon;
   nux::Point3   render_center;
   nux::Point3   logical_center;
+  nux::Vector3  rotation;
   nux::Color    colorify;
-  float         x_rotation;
-  float         y_rotation;
-  float         z_rotation;
   float         alpha;
   float         saturation;
   float         backlight_intensity;

=== modified file 'unity-shared/FileManager.h'
--- unity-shared/FileManager.h	2013-03-29 17:44:12 +0000
+++ unity-shared/FileManager.h	2013-04-12 23:35:32 +0000
@@ -22,6 +22,7 @@
 #define UNITYSHELL_FILEMANAGER_H
 
 #include <memory>
+#include <vector>
 #include <string>
 #include <sigc++/sigc++.h>
 

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2013-04-08 14:35:06 +0000
+++ unity-shared/IconRenderer.cpp	2013-04-12 23:35:32 +0000
@@ -235,6 +235,13 @@
   nux::ObjectPtr<nux::IOpenGLAsmShaderProgram> asm_shader;
 #endif
 
+  int VertexLocation;
+  int VPMatrixLocation;
+  int TextureCoord0Location;
+  int FragmentColor;
+  int ColorifyColor;
+  int DesatFactor;
+
   std::map<char, BaseTexturePtr> labels;
 
 private:
@@ -264,9 +271,6 @@
   pip_style = OUTSIDE_TILE;
 }
 
-IconRenderer::~IconRenderer()
-{}
-
 void IconRenderer::SetTargetSize(int tile_size, int image_size_, int spacing_)
 {
   icon_size = tile_size;
@@ -291,9 +295,20 @@
   int i;
   for (it = args.begin(), i = 0; it != args.end(); ++it, ++i)
   {
-
     IconTextureSource* launcher_icon = it->icon;
 
+    if (it->render_center == launcher_icon->LastRenderCenter(monitor) &&
+        it->logical_center == launcher_icon->LastLogicalCenter(monitor) &&
+        it->rotation == launcher_icon->LastRotation(monitor) &&
+        it->skip == launcher_icon->WasSkipping(monitor))
+    {
+      continue;
+    }
+
+    launcher_icon->RememberCenters(monitor, it->render_center, it->logical_center);
+    launcher_icon->RememberRotation(monitor, it->rotation);
+    launcher_icon->RememberSkip(monitor, it->skip);
+
     float w = icon_size;
     float h = icon_size;
     float x = it->render_center.x - w / 2.0f; // x: top left corner
@@ -309,9 +324,9 @@
     }
 
     ObjectMatrix = nux::Matrix4::TRANSLATE(geo.width / 2.0f, geo.height / 2.0f, z) * // Translate the icon to the center of the viewport
-                   nux::Matrix4::ROTATEX(it->x_rotation) *              // rotate the icon
-                   nux::Matrix4::ROTATEY(it->y_rotation) *
-                   nux::Matrix4::ROTATEZ(it->z_rotation) *
+                   nux::Matrix4::ROTATEX(it->rotation.x) *              // rotate the icon
+                   nux::Matrix4::ROTATEY(it->rotation.y) *
+                   nux::Matrix4::ROTATEZ(it->rotation.z) *
                    nux::Matrix4::TRANSLATE(-x - w / 2.0f, -y - h / 2.0f, -z); // Put the center the icon to (0, 0)
 
     ViewProjectionMatrix = PremultMatrix * ObjectMatrix;
@@ -369,9 +384,9 @@
       z = it->render_center.z;
 
       ObjectMatrix = nux::Matrix4::TRANSLATE(geo.width / 2.0f, geo.height / 2.0f, z) * // Translate the icon to the center of the viewport
-                     nux::Matrix4::ROTATEX(it->x_rotation) *              // rotate the icon
-                     nux::Matrix4::ROTATEY(it->y_rotation) *
-                     nux::Matrix4::ROTATEZ(it->z_rotation) *
+                     nux::Matrix4::ROTATEX(it->rotation.x) *              // rotate the icon
+                     nux::Matrix4::ROTATEY(it->rotation.y) *
+                     nux::Matrix4::ROTATEZ(it->rotation.z) *
                      nux::Matrix4::TRANSLATE(-(it->render_center.x - w / 2.0f) - w / 2.0f, -(it->render_center.y - h / 2.0f) - h / 2.0f, -z); // Put the center the icon to (0, 0)
 
       ViewProjectionMatrix = PremultMatrix * ObjectMatrix;
@@ -754,9 +769,9 @@
   if (icon.IsNull())
     return;
 
-  if (std::abs(arg.x_rotation) < 0.01f &&
-      std::abs(arg.y_rotation) < 0.01f &&
-      std::abs(arg.z_rotation) < 0.01f &&
+  if (std::abs(arg.rotation.x) < 0.01f &&
+      std::abs(arg.rotation.y) < 0.01f &&
+      std::abs(arg.rotation.z) < 0.01f &&
       !force_filter)
   {
     icon->SetFiltering(GL_NEAREST, GL_NEAREST);
@@ -823,20 +838,15 @@
   {
     textures_->shader_program_uv_persp_correction->Begin();
 
-    int TextureObjectLocation = textures_->shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");
-    VertexLocation            = textures_->shader_program_uv_persp_correction->GetAttributeLocation("iVertex");
-    TextureCoord0Location     = textures_->shader_program_uv_persp_correction->GetAttributeLocation("iTexCoord0");
-    FragmentColor             = textures_->shader_program_uv_persp_correction->GetUniformLocationARB("color0");
-    ColorifyColor             = textures_->shader_program_uv_persp_correction->GetUniformLocationARB("colorify_color");
-    DesatFactor               = textures_->shader_program_uv_persp_correction->GetUniformLocationARB("desat_factor");
-
-    if (TextureObjectLocation != -1)
-      CHECKGL(glUniform1iARB(TextureObjectLocation, 0));
-
-    int VPMatrixLocation = textures_->shader_program_uv_persp_correction->GetUniformLocationARB("ViewProjectionMatrix");
-    if (VPMatrixLocation != -1)
+    VertexLocation = textures_->VertexLocation;
+    TextureCoord0Location = textures_->TextureCoord0Location;
+    FragmentColor = textures_->FragmentColor;
+    ColorifyColor = textures_->ColorifyColor;
+    DesatFactor = textures_->DesatFactor;
+
+    if (textures_->VPMatrixLocation != -1)
     {
-      textures_->shader_program_uv_persp_correction->SetUniformLocMatrix4fv((GLint)VPMatrixLocation, 1, false, (GLfloat*) & (stored_projection_matrix_.m));
+      textures_->shader_program_uv_persp_correction->SetUniformLocMatrix4fv((GLint)textures_->VPMatrixLocation, 1, false, (GLfloat*) & (stored_projection_matrix_.m));
     }
   }
 #ifndef USE_GLES
@@ -922,7 +932,7 @@
                                     nux::Geometry const& geo)
 {
   int markerCenter = (int) arg.render_center.y;
-  markerCenter -= (int)(arg.x_rotation / (2 * M_PI) * icon_size);
+  markerCenter -= (int)(arg.rotation.x / (2 * M_PI) * icon_size);
 
 
   if (running > 0)
@@ -1194,6 +1204,12 @@
 
 IconRenderer::TexturesPool::TexturesPool()
   : offscreen_progress_texture(nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, nux::BITFMT_R8G8B8A8))
+  , VertexLocation(-1)
+  , VPMatrixLocation(0)
+  , TextureCoord0Location(-1)
+  , FragmentColor(0)
+  , ColorifyColor(0)
+  , DesatFactor(0)
 {
   LoadTexture(progress_bar_trough, PKGDATADIR"/progress_bar_trough.png");
   LoadTexture(progress_bar_fill, PKGDATADIR"/progress_bar_fill.png");
@@ -1249,6 +1265,22 @@
     shader_program_uv_persp_correction = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateShaderProgram();
     shader_program_uv_persp_correction->LoadIShader(gPerspectiveCorrectShader.c_str());
     shader_program_uv_persp_correction->Link();
+
+    shader_program_uv_persp_correction->Begin();
+
+    int TextureObjectLocation = shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");
+    VertexLocation            = shader_program_uv_persp_correction->GetAttributeLocation("iVertex");
+    TextureCoord0Location     = shader_program_uv_persp_correction->GetAttributeLocation("iTexCoord0");
+    FragmentColor             = shader_program_uv_persp_correction->GetUniformLocationARB("color0");
+    ColorifyColor             = shader_program_uv_persp_correction->GetUniformLocationARB("colorify_color");
+    DesatFactor               = shader_program_uv_persp_correction->GetUniformLocationARB("desat_factor");
+
+    if (TextureObjectLocation != -1)
+      CHECKGL(glUniform1iARB(TextureObjectLocation, 0));
+
+    VPMatrixLocation = shader_program_uv_persp_correction->GetUniformLocationARB("ViewProjectionMatrix");
+
+    shader_program_uv_persp_correction->End();
   }
   else
   {

=== modified file 'unity-shared/IconRenderer.h'
--- unity-shared/IconRenderer.h	2013-03-19 13:24:45 +0000
+++ unity-shared/IconRenderer.h	2013-04-12 23:35:32 +0000
@@ -37,7 +37,6 @@
 {
 public:
   IconRenderer();
-  virtual ~IconRenderer();
 
   void PreprocessIcons(std::list<RenderArg>& args, nux::Geometry const& target_window);
 

=== modified file 'unity-shared/IconTextureSource.cpp'
--- unity-shared/IconTextureSource.cpp	2012-05-07 00:49:31 +0000
+++ unity-shared/IconTextureSource.cpp	2013-04-12 23:35:32 +0000
@@ -26,21 +26,58 @@
 {
 NUX_IMPLEMENT_OBJECT_TYPE(IconTextureSource);
 
+namespace
+{
+  const unsigned RENDERERS_SIZE = max_num_monitors + 1; // +1 for the switcher
+}
+
 IconTextureSource::IconTextureSource()
-{
-  transform_map.resize(max_num_monitors);
-}
+  : skip_(RENDERERS_SIZE, false)
+  , last_render_center_(RENDERERS_SIZE)
+  , last_logical_center_(RENDERERS_SIZE)
+  , last_rotation_(RENDERERS_SIZE)
+  , transformations_(RENDERERS_SIZE, decltype(transformations_)::value_type(TRANSFORM_SIZE, std::vector<nux::Vector4>(4)))
+{}
 
 std::vector<nux::Vector4> & IconTextureSource::GetTransform(TransformIndex index, int monitor)
 {
-  auto iter = transform_map[monitor].find(index);
-  if (iter == transform_map[monitor].end())
-  {
-    auto iter2 = transform_map[monitor].insert(std::map<TransformIndex, std::vector<nux::Vector4> >::value_type(index, std::vector<nux::Vector4>(4)));
-    return iter2.first->second;
-  }
-
-  return iter->second;
+  return transformations_[monitor][index];
+}
+
+void IconTextureSource::RememberCenters(int monitor, nux::Point3 const& render, nux::Point3 const& logical)
+{
+  last_render_center_[monitor] = render;
+  last_logical_center_[monitor] = logical;
+}
+
+void IconTextureSource::RememberRotation(int monitor, nux::Vector3 const& rotation)
+{
+  last_rotation_[monitor] = rotation;
+}
+
+nux::Point3 const& IconTextureSource::LastRenderCenter(int monitor) const
+{
+  return last_render_center_[monitor];
+}
+
+nux::Point3 const& IconTextureSource::LastLogicalCenter(int monitor) const
+{
+  return last_logical_center_[monitor];
+}
+
+nux::Vector3 const& IconTextureSource::LastRotation(int monitor) const
+{
+  return last_rotation_[monitor];
+}
+
+void IconTextureSource::RememberSkip(int monitor, bool skip)
+{
+  skip_[monitor] = skip;
+}
+
+bool IconTextureSource::WasSkipping(int monitor) const
+{
+  return skip_[monitor];
 }
 
 }

=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2012-05-28 16:16:06 +0000
+++ unity-shared/IconTextureSource.h	2013-04-12 23:35:32 +0000
@@ -22,7 +22,6 @@
 #define ICONTEXTURESOURCE_H
 
 #include <Nux/Nux.h>
-#include <NuxCore/Property.h>
 #include <NuxCore/Math/MathInc.h>
 
 namespace unity
@@ -38,17 +37,27 @@
 
   enum TransformIndex
   {
-    TRANSFORM_TILE,
+    TRANSFORM_TILE = 0,
     TRANSFORM_IMAGE,
     TRANSFORM_HIT_AREA,
     TRANSFORM_GLOW,
     TRANSFORM_EMBLEM,
+    TRANSFORM_SIZE
   };
 
   IconTextureSource();
 
   std::vector<nux::Vector4> & GetTransform(TransformIndex index, int monitor);
 
+  nux::Point3 const& LastRenderCenter(int monitor) const;
+  nux::Point3 const& LastLogicalCenter(int monitor) const;
+  nux::Vector3 const& LastRotation(int monitor) const;
+  void RememberCenters(int monitor, nux::Point3 const& render, nux::Point3 const& logical);
+  void RememberRotation(int monitor, nux::Vector3 const& rotation);
+
+  void RememberSkip(int monitor, bool skip);
+  bool WasSkipping(int monitor) const;
+
   virtual nux::Color BackgroundColor() const = 0;
 
   virtual nux::Color GlowColor() = 0;
@@ -58,7 +67,11 @@
   virtual nux::BaseTexture* Emblem() = 0;
 
 private:
-  std::vector<std::map<TransformIndex, std::vector<nux::Vector4> > > transform_map;
+  std::vector<bool> skip_;
+  std::vector<nux::Point3> last_render_center_;
+  std::vector<nux::Point3> last_logical_center_;
+  std::vector<nux::Vector3> last_rotation_;
+  std::vector<std::vector<std::vector<nux::Vector4>>> transformations_;
 };
 
 }