Merge lp:~smspillaz/unity/untiy.less-paint-insanity into lp:unity

[Sam Spilsbury]

Removes the whole scanning of the list thing in getWindowPaintList and the whole "trying to figure out where the window was because we don't actually know" in glDraw by scanning the paint list again and again.

There's a much better way of doing this - just hook glPaint, skip the wrap chain to core (eg every single plugin skipped) and tell core not to do anything with the window.

I have no idea why there is a bunch of logic about whether or not to paint the panel in glDraw (that was moved to glPaint). Someone enlighten me?

[Sam Spilsbury (smspillaz)]

Bump?

I'd like to see this go in, because it should reduce lots of list copying within unity and also lots of unecessary list traversal, which should represent a nice speed boost. In addition, its far simpler in its implementation and far less bug prone.

I'm sure testing is probably an issue. I'll have another quick look at the code and see if I can think of a way to get it under test.

Unmerged revisions

2371. By Sam Spilsbury on 2012-05-29

Just use PAINT_WINDOW_NO_CORE_INSTANCE_MASK properly in glPaint
rather than futzing around with paint lists

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-05-31 09:28:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-07 00:52:22 +0000
@@ -2127,31 +2127,6 @@
   return "Unity";
 }
 
-bool isNuxWindow (CompWindow* value)
-{
-  std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
-  auto id = value->id();
-
-  // iterate loop by hand rather than use std::find as this is considerably faster
-  // we care about performance here becuase of the high frequency in which this function is
-  // called (nearly every frame)
-  unsigned int size = xwns.size();
-  for (unsigned int i = 0; i < size; ++i)
-  {
-    if (xwns[i] == id)
-      return true;
-  }
-  return false;
-}
-
-const CompWindowList& UnityScreen::getWindowPaintList()
-{
-  CompWindowList& pl = _withRemovedNuxWindows = cScreen->getWindowPaintList();
-  pl.remove_if(isNuxWindow);
-
-  return pl;
-}
-
 void UnityScreen::RaiseInputWindows()
 {
   std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
@@ -2164,13 +2139,11 @@
   }
 }
 
-/* detect occlusions
- *
- * core passes down the PAINT_WINDOW_OCCLUSION_DETECTION
- * mask when it is doing occlusion detection, so use that
- * order to fill our occlusion buffer which we'll flip
- * to nux later
- */
+/* we want to paint underneath other windows here,
+ * so we need to find if this window is actually
+ * stacked on top of one of the nux input windows
+ * and if so paint nux and stop us from painting
+ * other windows or on top of the whole screen */
 bool UnityWindow::glPaint(const GLWindowPaintAttrib& attrib,
                           const GLMatrix& matrix,
                           const CompRegion& region,
@@ -2199,25 +2172,6 @@
     }
   }
 
-  return gWindow->glPaint(wAttrib, matrix, region, mask);
-}
-
-/* handle window painting in an opengl context
- *
- * we want to paint underneath other windows here,
- * so we need to find if this window is actually
- * stacked on top of one of the nux input windows
- * and if so paint nux and stop us from painting
- * other windows or on top of the whole screen */
-bool UnityWindow::glDraw(const GLMatrix& matrix,
-#ifndef USE_MODERN_COMPIZ_GL
-                         GLFragment::Attrib& attrib,
-#else
-                         const GLWindowPaintAttrib& attrib,
-#endif
-                         const CompRegion& region,
-                         unsigned int mask)
-{
   if (uScreen->doShellRepaint && !uScreen->paint_panel_ && window->type() == CompWindowTypeNormalMask)
   {
     guint32 id = window->id();
@@ -2234,30 +2188,36 @@
     }
   }
 
-  if (uScreen->doShellRepaint && !uScreen->forcePaintOnTop ())
+  std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
+  for (unsigned int i = 0; i < xwns.size(); i++)
   {
-    std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
-    unsigned int size = xwns.size();
-
-    for (CompWindow* w = window; w && uScreen->doShellRepaint; w = w->prev)
-    {
-      auto id = w->id();
-
-      for (unsigned int i = 0; i < size; ++i)
+      if (xwns[i] == window->id ())
       {
-        if (xwns[i] == id)
-        {
-#ifdef USE_MODERN_COMPIZ_GL
-          uScreen->paintDisplay();
+	  if (uScreen->doShellRepaint &&
+	      !uScreen->forcePaintOnTop () &&
+	      !(mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK))
+	      uScreen->paintDisplay (region, matrix, mask);
+
+	  /* Skip to end and don't paint */
+	  gWindow->glPaintSetCurrentIndex (std::numeric_limits<unsigned int>::max ());
+	  return gWindow->glPaint (attrib, matrix, emptyRegion, mask | PAINT_WINDOW_NO_CORE_INSTANCE_MASK);
+      }
+  }
+
+  return gWindow->glPaint(wAttrib, matrix, region, mask);
+}
+
+/* handle window painting in an opengl context
+ */
+bool UnityWindow::glDraw(const GLMatrix& matrix,
+#ifndef USE_MODERN_COMPIZ_GL
+                         GLFragment::Attrib& attrib,
 #else
-          uScreen->paintDisplay(region, matrix, mask);
+                         const GLWindowPaintAttrib& attrib,
 #endif
-          break;
-        }
-      }
-    }
-  }
-
+                         const CompRegion& region,
+                         unsigned int mask)
+{
   if (window->type() == CompWindowTypeDesktopMask)
     uScreen->setPanelShadowMatrix(matrix);
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-05-28 03:19:35 +0000
+++ plugins/unityshell/src/unityshell.h	2012-06-07 00:52:22 +0000
@@ -132,9 +132,6 @@
                                 CompOutput*,
                                 unsigned int);
 
-  /* Pop our InputOutput windows from the paint list */
-  const CompWindowList& getWindowPaintList();
-
   /* handle X11 events */
   void handleEvent(XEvent*);
 
@@ -279,7 +276,6 @@
   bool    damaged;
   bool    _key_nav_mode_requested;
   CompOutput* _last_output;
-  CompWindowList _withRemovedNuxWindows;
 
   nux::Property<nux::Geometry> primary_monitor_;