← Back to branch summary

~smspillaz/unity/unity.less-paint-insanity

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.cpp

  • Committer: smspillaz
  • Date: 2012-05-29 05:16:04 UTC
  • Revision ID: sam.spilsbury@canonical.com-20120529051604-w7fn7qvz0qhcyieo
Fix indentation and build using USE_MODERN_COMPIZ_GL

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.cpp
625
625
  }
626
626
  glPopMatrix();
627
627
#else
628
 
#warning Panel shadow not properly implemented for GLES2
629
628
  return;
630
629
 
631
630
  if (relayoutSourceId > 0)
2192
2191
  std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
2193
2192
  for (unsigned int i = 0; i < xwns.size(); i++)
2194
2193
  {
2195
 
      if (xwns[i] == window->id ())
2196
 
      {
2197
 
          if (uScreen->doShellRepaint &&
2198
 
              !uScreen->forcePaintOnTop () &&
2199
 
              !(mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK))
 
2194
    if (xwns[i] == window->id ())
 
2195
    {
 
2196
      if (uScreen->doShellRepaint &&
 
2197
                !uScreen->forcePaintOnTop () &&
 
2198
                !(mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK))
 
2199
#ifndef USE_MODERN_COMPIZ_GL
2200
2200
              uScreen->paintDisplay (region, matrix, mask);
2201
 
 
2202
 
          /* Skip to end and don't paint */
2203
 
          gWindow->glPaintSetCurrentIndex (std::numeric_limits<unsigned int>::max ());
2204
 
          return gWindow->glPaint (attrib, matrix, emptyRegion, mask | PAINT_WINDOW_NO_CORE_INSTANCE_MASK);
2205
 
      }
 
2201
#else
 
2202
        uScreen->paintDisplay ();
 
2203
#endif
 
2204
            /* Skip to end and don't paint */
 
2205
            gWindow->glPaintSetCurrentIndex (std::numeric_limits<unsigned int>::max ());
 
2206
            return gWindow->glPaint (attrib, matrix, emptyRegion, mask | PAINT_WINDOW_NO_CORE_INSTANCE_MASK);
 
2207
    }
2206
2208
  }
2207
2209
 
2208
2210
  return gWindow->glPaint(wAttrib, matrix, region, mask);