Merge lp:~unity-team/unity/unity.blur-but-faster-fbo-disabler into lp:~unity-team/unity/unity.blur-but-faster

[Sam Spilsbury]

This basically disables painting and binding the fbo when we're not using it.

[Gord Allott (gordallott)]

conflicts with trunk and if this is based on https://code.launchpad.net/~unity-team/unity/unity.blur_fixes_fbo/+merge/72187 then it should be marked as such in the review, there is a box to state this branch depends on another box, it makes launchpad understand the diffs better

review: Needs Fixing

Unmerged revisions

1404. By Sam Spilsbury on 2011-08-20

Merge in blur fbo branch

1403. By Jason Smith on 2011-08-20

dramatically improve blur performance

1402. By Jason Smith on 2011-08-19

fix crash when view window is null

1401. By Jay Taoko on 2011-08-19

Essential Nux event signals have been renamed. To ease the transition, the former name have been preserved via macros:

#define OnMouseMove mouse_move
#define OnMouseDown mouse_down
#define OnMouseUp mouse_up
#define OnMouseEnter mouse_enter
#define OnMouseLeave mouse_leave
#define OnMouseClick mouse_click
#define OnMouseDoubleClick mouse_double_click
#define OnMouseDrag mouse_drag
#define OnMouseWheel mouse_wheel
#define OnMouseDownOutsideArea mouse_down_outside_pointer_grab_area
#define OnKeyEvent key_down
#define OnKeyReleased key_up
#define OnStartKeyboardReceiver begin_key_focus
#define OnStopKeyboardReceiver end_key_focus

This branch is using the new signals names. Subsequently, the old signals will be removed in Nux.

1400. By Neil J. Patel on 2011-08-19

Select the current search string when opening the dash to allow for typing straight away

1399. By Andrea Azzarone on 2011-08-19

Merge awesome work of Anrea Azzarone to make launcher detect contents of DND before DND even enters launcher

1398. By Jason Smith on 2011-08-19

fix typo

1397. By Andrea Azzarone on 2011-08-19

[merge] Bug #824831: Fallback window controls shown for maximized windows

1396. By Neil J. Patel on 2011-08-19

Protect against a null iter.second

1395. By Jason Smith on 2011-08-19

dont ask nux to process events when the switcher is open, those events are not meant for it.

=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.cpp'
--- plugins/unityshell/src/BackgroundEffectHelper.cpp	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/BackgroundEffectHelper.cpp	2011-08-20 08:35:23 +0000
@@ -33,7 +33,8 @@
 nux::Property<bool> BackgroundEffectHelper::updates_enabled (true);
 
 
-BackgroundEffectHelper::BackgroundEffectHelper()
+BackgroundEffectHelper::BackgroundEffectHelper() :
+  noise_texture_ (nux::CreateTextureFromFile(PKGDATADIR"/dash_noise.png"))
 {
   enabled = true;
   enabled.changed.connect (sigc::mem_fun (this, &BackgroundEffectHelper::OnEnabledChanged));
@@ -43,8 +44,8 @@
 
 BackgroundEffectHelper::~BackgroundEffectHelper()
 {
+  Unregister (this);
   noise_texture_->UnReference();
-  Unregister(this);
 }
 
 void BackgroundEffectHelper::OnEnabledChanged(bool value)
@@ -87,6 +88,15 @@
   }
 }
 
+bool BackgroundEffectHelper::EnabledBackgroundHelpers()
+{
+  for (BackgroundEffectHelper *bg_effect_helper : registered_list_)
+    if (bg_effect_helper->enabled)
+      return true;
+
+  return false;
+}
+
 void BackgroundEffectHelper::Register   (BackgroundEffectHelper *self)
 {
   registered_list_.push_back(self);
@@ -118,7 +128,10 @@
 
   blur_geometry_ =  nux::Geometry(0, 0, graphics_engine->GetWindowWidth(), graphics_engine->GetWindowHeight()).Intersect(geo);
 
-  if (blur_geometry_.IsNull() || blur_type == BLUR_NONE || !nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_.IsValid())
+  if (blur_geometry_.IsNull() ||
+      blur_type == BLUR_NONE  ||
+      !nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_.IsValid() ||
+      !enabled)
   {
     return nux::ObjectPtr<nux::IOpenGLBaseTexture>(NULL);
   }

=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.h'
--- plugins/unityshell/src/BackgroundEffectHelper.h	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/BackgroundEffectHelper.h	2011-08-20 08:35:23 +0000
@@ -54,6 +54,7 @@
   void DirtyCache ();
 
   static void QueueDrawOnOwners ();
+  static bool EnabledBackgroundHelpers ();
 
   static void SetDamageBounds(nux::Geometry const& damage);
   static void ResetDamageBounds();
@@ -64,7 +65,6 @@
   static nux::Property<float> sigma_low;
   static nux::Property<bool> updates_enabled;
 
-protected:
   static void Register   (BackgroundEffectHelper *self);
   static void Unregister (BackgroundEffectHelper *self);
 
@@ -79,7 +79,8 @@
   nux::ObjectPtr<nux::IOpenGLBaseTexture> ds_temp_device_texture1_;
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> blur_texture_;
-  nux::Geometry blur_geometry_;
+  nux::Geometry                           blur_geometry_;
+  bool                                    registered_;
 
   static std::list<BackgroundEffectHelper*> registered_list_;
   static nux::Geometry damage_bounds_;

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/DashController.cpp	2011-08-20 08:35:23 +0000
@@ -209,6 +209,8 @@
   window_->EnableInputWindow(false, "Dash", true, false);
   visible_ = false;
 
+  view_->AboutToHide ();
+
   StartShowHideTimeline();
 
   ubus_manager_.SendMessage(UBUS_PLACE_VIEW_HIDDEN);

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-08-20 08:35:23 +0000
@@ -62,7 +62,8 @@
 }
 
 DashView::~DashView()
-{}
+{
+}
 
 void DashView::AboutToShow()
 {
@@ -209,7 +210,7 @@
     nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, content_geo_.width, content_geo_.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
 
-    if (bg_blur_texture_.IsValid()  && paint_blur)
+    if (bg_blur_texture_.IsValid() && paint_blur)
     {
       nux::TexCoordXForm texxform_blur_bg;
       texxform_blur_bg.flip_v_coord = true;

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-08-20 08:35:23 +0000
@@ -52,7 +52,8 @@
       _opacity(1.0f),
       _is_primary(false),
       _monitor(0),
-      _dash_is_open(false)
+      _dash_is_open(false),
+      bg_blur_texture_ (NULL)
 {
   _needs_geo_sync = false;
   _style = new PanelStyle();
@@ -101,6 +102,7 @@
    ubus_server_send_message (ubus, UBUS_BACKGROUND_REQUEST_COLOUR_EMIT, NULL);
 
   _track_menu_pointer_id = 0;
+
   bg_effect_helper_.owner = this;
 }
 
@@ -186,12 +188,16 @@
 
   GfxContext.PushClippingRectangle(GetGeometry());
 
-  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+  if (BackgroundEffectHelper::blur_type != BLUR_NONE &&
+      (_dash_is_open || _opacity != 1.0f))
   {
     nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, geo.width, geo.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
 
-    if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+    if (!bg_effect_helper_.enabled)
+      bg_effect_helper_.enabled = true;
+
+    if (bg_blur_texture_.IsValid())
     {
       nux::TexCoordXForm texxform_blur_bg;
       texxform_blur_bg.flip_v_coord = true;
@@ -217,6 +223,11 @@
       GfxContext.PopClippingRectangle();
     }
   }
+  else
+  {
+    if (bg_effect_helper_.enabled)
+      bg_effect_helper_.enabled = false;
+  }
 
   nux::GetPainter().RenderSinglePaintLayer(GfxContext, GetGeometry(), _bg_layer);
 
@@ -240,7 +251,9 @@
   GfxContext.GetRenderStates().SetBlend(true);
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+  if (bg_blur_texture_.IsValid()
+      && BackgroundEffectHelper::blur_type != BLUR_NONE
+      && (_dash_is_open || _opacity != 1.0f))
   {
     nux::Geometry geo_absolute = GetAbsoluteGeometry ();
     nux::TexCoordXForm texxform_blur_bg;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-08-20 00:58:03 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-08-20 08:35:23 +0000
@@ -111,7 +111,7 @@
   , _key_nav_mode_requested(false)
   , _last_output(nullptr)
   , switcher_desktop_icon(nullptr)
-  , mActiveFbo (0)
+  , _active_fbo (0)
   , grab_index_ (0)
 {
   Timer timer;
@@ -162,10 +162,9 @@
 
   if (GL::fbo)
   {
-    foreach (CompOutput &o, screen->outputDevs ())
-      uScreen->mFbos[&o] = UnityFBO::Ptr (new UnityFBO (&o));
-    
-    uScreen->mFbos[&(screen->fullscreenOutput ())] = UnityFBO::Ptr (new UnityFBO (&(screen->fullscreenOutput ())));
+    CompRect geometry = CompRect (0, 0, screen->width (), screen->height ());
+
+    uScreen->_fbo = UnityFBO::Ptr (new UnityFBO (geometry));
   }
 
   optionSetLauncherHideModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -305,6 +304,10 @@
    * drivers (lp:703140). */
   glDisable(GL_LIGHTING);
 
+  if (BackgroundEffectHelper::EnabledBackgroundHelpers () &&
+      _fbo->status ())
+      _fbo->unbind ();
+
   /* reset matrices */
   glPushAttrib(GL_VIEWPORT_BIT | GL_ENABLE_BIT |
                GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT);
@@ -320,8 +323,6 @@
 
 void UnityScreen::nuxEpilogue()
 {
-  (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, mActiveFbo);
-
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   glMatrixMode(GL_MODELVIEW);
@@ -343,6 +344,9 @@
   glPopAttrib();
 
   glDisable(GL_SCISSOR_TEST);
+
+  if (BackgroundEffectHelper::EnabledBackgroundHelpers ())
+      _fbo->bind ();
 }
 
 void UnityScreen::OnLauncherHiddenChanged()
@@ -353,17 +357,10 @@
     screen->removeAction(&optionGetLauncherRevealEdge());
 }
 
-void UnityScreen::paintPanelShadow(const GLMatrix& matrix)
+void UnityScreen::paintPanelShadow()
 {
-  if (relayoutSourceId > 0)
-    return;
-
-  if (PluginAdapter::Default()->IsExpoActive())
-    return;
-
-  nuxPrologue();
-
   CompOutput* output = _last_output;
+  GLMatrix    sTransform = GLMatrix ();
   float vc[4];
   float h = 20.0f;
   float w = 1.0f;
@@ -374,6 +371,14 @@
   float x2 = x1 + output->width();
   float y2 = y1 + h;
 
+  if (relayoutSourceId > 0)
+    return;
+
+  if (PluginAdapter::Default()->IsExpoActive())
+    return;
+
+  sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
+
   vc[0] = x1;
   vc[1] = x2;
   vc[2] = y1;
@@ -411,7 +416,6 @@
       glDisable(GL_BLEND);
     }
   }
-  nuxEpilogue();
 }
 
 void
@@ -430,24 +434,33 @@
 {
   CompOutput *output = _last_output;
 
-  mFbos[output]->unbind ();
-
-  /* Draw the bit of the relevant framebuffer for each output */
-  mFbos[output]->paint ();
-
   nuxPrologue();
-  nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture = 
-  nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(mFbos[output]->texture(), 
-  output->width(), output->height(), 1, nux::BITFMT_R8G8B8A8);
-
-  nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
+
+  if (BackgroundEffectHelper::EnabledBackgroundHelpers () &&
+      _fbo->status ())
+  {
+      _fbo->paint (output);
+      nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
+          nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(_fbo->texture (),
+                                                                           output->width(),
+                                                                           output->height(),
+                                                                           1,
+                                                                           nux::BITFMT_R8G8B8A8);
+
+      nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
+  }
 
   nux::Geometry geo = nux::Geometry (output->x (), output->y (), output->width (), output->height ());
 
   wt->RenderInterfaceFromForeignCmd (&geo);
   nuxEpilogue();
 
-if (switcherController->Visible ())
+  /* We aren't painting the fbo after this so no need to have it bound */
+  if (BackgroundEffectHelper::EnabledBackgroundHelpers () &&
+      _fbo->status ())
+      _fbo->unbind ();
+
+  if (switcherController->Visible ())
   {
     LayoutWindowList targets = switcherController->ExternalRenderTargets ();
 
@@ -502,9 +515,6 @@
 {
   bool ret;
 
-  /* bind the framebuffer here */
-  mFbos[output]->bind ();
-
   doShellRepaint = true;
   allowWindowPaint = true;
   _last_output = output;
@@ -527,8 +537,6 @@
                                            CompOutput* output,
                                            unsigned int mask)
 {
-  /* bind the framebuffer here */
-  mFbos[output]->bind ();
   allowWindowPaint = false;
   /* urgh */
   gScreen->glPaintOutput(attrib, transform, region, output, mask);
@@ -558,6 +566,14 @@
 
 }
 
+void UnityScreen::paint (CompOutput::ptrList &outputs,
+			 unsigned int mask)
+{
+  if (BackgroundEffectHelper::EnabledBackgroundHelpers ())
+      _fbo->bind ();
+
+  cScreen->paint (outputs, mask);
+}
 /* Grab changed nux regions and add damage rects for them */
 void UnityScreen::damageNuxRegions()
 {
@@ -1111,7 +1127,7 @@
 
   if (window->type() == CompWindowTypeDesktopMask)
   {
-    uScreen->paintPanelShadow(matrix);
+    uScreen->paintPanelShadow();
   }
 
   return ret;
@@ -1281,10 +1297,9 @@
 
   if (GL::fbo)
   {
-    foreach (CompOutput &o, screen->outputDevs ())
-      uScreen->mFbos[&o] = UnityFBO::Ptr (new UnityFBO (&o));
-    
-    uScreen->mFbos[&(screen->fullscreenOutput ())] = UnityFBO::Ptr (new UnityFBO (&(screen->fullscreenOutput ())));
+    CompRect geometry = CompRect (0, 0, screen->width (), screen->height ());
+
+    uScreen->_fbo = UnityFBO::Ptr (new UnityFBO (geometry));
   }
 
   scr = gdk_screen_get_default ();
@@ -1318,8 +1333,6 @@
 {
   UnityScreen* uScr = reinterpret_cast<UnityScreen*>(data);
 
-  uScreen->mFbos.clear ();
-
   uScr->NeedsRelayout ();
   uScr->Relayout();
   uScr->relayoutSourceId = 0;
@@ -1350,18 +1363,17 @@
   ScheduleRelayout(500);
 }
 
-void UnityFBO::paint ()
+void UnityFBO::paint (CompOutput *output)
 {
-  //CompositeScreen *cScreen = CompositeScreen::get (screen);
-  //unsigned int    mask = cScreen->damageMask ();
   float texx, texy, texwidth, texheight;
 
   /* Draw the bit of the relevant framebuffer for each output */
   GLMatrix transform;
 
-  glViewport (output->x (), screen->height () - output->y2 (), output->width (), output->height ());
+  glPushAttrib (GL_VIEWPORT_BIT);
+  glViewport (0, 0, screen->width (), screen->height ());
 
-  transform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
+  transform.toScreenSpace (&screen->fullscreenOutput (), -DEFAULT_Z_CAMERA);
   glPushMatrix ();
   glLoadMatrixf (transform.getMatrix ());
 
@@ -1406,6 +1418,7 @@
     glDisable (GL_SCISSOR_TEST);
     glPopAttrib ();
   }
+  glPopAttrib ();
 
   glPopMatrix();
 }
@@ -1417,6 +1430,7 @@
 
   glDrawBuffer (GL_BACK);
   glReadBuffer (GL_BACK);
+  glPopAttrib ();
 
 }
 
@@ -1436,7 +1450,7 @@
     glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, output->width (), output->height (), 0, GL_BGRA,
+    glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, mGeometry.width (), mGeometry.height (), 0, GL_BGRA,
 #if IMAGE_BYTE_ORDER == MSBFirst
 		  GL_UNSIGNED_INT_8_8_8_8_REV,
 #else
@@ -1502,21 +1516,23 @@
   {
     uScreen->setActiveFbo (mFboHandle);
 
+    glPushAttrib (GL_VIEWPORT_BIT | GL_CURRENT_BIT);
+
     glDrawBuffer (GL_COLOR_ATTACHMENT0_EXT);
     glReadBuffer (GL_COLOR_ATTACHMENT0_EXT);
 
     glViewport (0,
 		0,
-		output->width (),
-		output->height ());
+		mGeometry.width (),
+		mGeometry.height ());
 
   }
 }
 
-UnityFBO::UnityFBO (CompOutput *o)
+UnityFBO::UnityFBO (CompRect geometry)
  : mFboStatus (false)
  , mFBTexture (0)
- , output (o)
+ , mGeometry (geometry)
 {
   (*GL::genFramebuffers) (1, &mFboHandle);
 }

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-08-18 09:45:24 +0000
+++ plugins/unityshell/src/unityshell.h	2011-08-20 08:35:23 +0000
@@ -49,7 +49,7 @@
 
   typedef boost::shared_ptr <UnityFBO> Ptr;
 
-  UnityFBO (CompOutput *o);
+  UnityFBO (CompRect);
   ~UnityFBO ();
 
 public:
@@ -58,7 +58,7 @@
   void unbind ();
 
   bool status ();
-  void paint ();
+  void paint (CompOutput *);
   
   GLuint texture () { return mFBTexture; }
 
@@ -68,7 +68,7 @@
   GLuint   mFboHandle; // actual handle to the framebuffer_ext
   bool    mFboStatus; // did the framebuffer texture bind succeed
   GLuint   mFBTexture;
-  CompOutput *output;
+  CompRect mGeometry;
 };
 
 
@@ -101,6 +101,9 @@
   CompositeScreen* cScreen;
   GLScreen* gScreen;
 
+  /* grab everything into an fbo */
+  void paint (CompOutput::ptrList &outputs, unsigned int);
+
   /* prepares nux for drawing */
   void nuxPrologue();
   /* pops nux draw stack */
@@ -108,10 +111,9 @@
 
   /* nux draw wrapper */
   void paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask);
-  void paintPanelShadow(const GLMatrix& matrix);
+  void paintPanelShadow();
 
   void preparePaint (int ms);
-  void paintFboForOutput (CompOutput *output);
 
   /* paint on top of all windows if we could not find a window
    * to paint underneath */
@@ -175,7 +177,7 @@
   void NeedsRelayout();
   void ScheduleRelayout(guint timeout);
 
-  void setActiveFbo (GLuint fbo) { mActiveFbo = fbo; }
+  void setActiveFbo (GLuint fbo) { _active_fbo = fbo; }
 
 protected:
   const gchar* GetName();
@@ -250,8 +252,8 @@
 
   unity::BGHash _bghash;
 
-  std::map <CompOutput *, UnityFBO::Ptr> mFbos;
-  GLuint                                 mActiveFbo;
+  UnityFBO::Ptr _fbo;
+  GLuint        _active_fbo;
 
   bool   queryForShader ();
 
@@ -259,7 +261,7 @@
   bool dash_is_open_;
   CompScreen::GrabHandle grab_index_;
 
-	friend class UnityWindow;
+  friend class UnityWindow;
 };
 
 class UnityWindow :