Merge lp:~unity-team/unity/unity.fix-975103 into lp:unity

[Jay Taoko]

Deactivated panel blurring when a window is maximised and the dash is open on system without GLSL support.

* Fix for bug #975103
* Deactivated panel blurring when a window is maximised and the dash is open on system without GLSL support.

UNBLOCK

[Tim Penhey (thumper)]

Effectively only adding a single if check. Seems OK to me.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

as Tim told, just adding a check, and that enables to avoid the crash and slowliness that were experienced on low configuration. Now that the proper check for opengl 2 landed, time to UNBLOCK that one.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-09 12:48:05 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-09 16:27:19 +0000
@@ -754,34 +754,37 @@
 #ifndef USE_GLES
   bool was_bound = _fbo->bound ();
 
-  if (was_bound && launcher_controller_->IsOverlayOpen() && paint_panel_)
+  if (nux::GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath())
   {
-    if (panel_texture_has_changed_ || !panel_texture_.IsValid())
-    {
-      panel_texture_.Release();
-
-      nux::NBitmapData* bitmap = panel::Style::Instance().GetBackground(screen->width (), screen->height(), 1.0f);
-      nux::BaseTexture* texture2D = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-      if (bitmap && texture2D)
-      {
-        texture2D->Update(bitmap);
-        panel_texture_ = texture2D->GetDeviceTexture();
-        texture2D->UnReference();
-        delete bitmap;
-      }
-      panel_texture_has_changed_ = false;
-    }
-
-    if (panel_texture_.IsValid())
-    {
-      nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetModelViewMatrixStack();
-      nux::GetGraphicsDisplay()->GetGraphicsEngine()->Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
-      nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetProjectionMatrix();
-      nux::GetGraphicsDisplay()->GetGraphicsEngine()->SetOrthographicProjectionMatrix(screen->width (), screen->height());
-
-      nux::TexCoordXForm texxform;
-      int panel_height = panel_style_.panel_height;
-      nux::GetGraphicsDisplay()->GetGraphicsEngine()->QRP_GLSL_1Tex(0, 0, screen->width (), panel_height, panel_texture_, texxform, nux::color::White);
+    if (was_bound && launcher_controller_->IsOverlayOpen() && paint_panel_)
+    {
+      if (panel_texture_has_changed_ || !panel_texture_.IsValid())
+      {
+        panel_texture_.Release();
+
+        nux::NBitmapData* bitmap = panel::Style::Instance().GetBackground(screen->width (), screen->height(), 1.0f);
+        nux::BaseTexture* texture2D = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
+        if (bitmap && texture2D)
+        {
+          texture2D->Update(bitmap);
+          panel_texture_ = texture2D->GetDeviceTexture();
+          texture2D->UnReference();
+          delete bitmap;
+        }
+        panel_texture_has_changed_ = false;
+      }
+
+      if (panel_texture_.IsValid())
+      {
+        nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetModelViewMatrixStack();
+        nux::GetGraphicsDisplay()->GetGraphicsEngine()->Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
+        nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetProjectionMatrix();
+        nux::GetGraphicsDisplay()->GetGraphicsEngine()->SetOrthographicProjectionMatrix(screen->width (), screen->height());
+
+        nux::TexCoordXForm texxform;
+        int panel_height = panel_style_.panel_height;
+        nux::GetGraphicsDisplay()->GetGraphicsEngine()->QRP_GLSL_1Tex(0, 0, screen->width (), panel_height, panel_texture_, texxform, nux::color::White);
+      }
     }
   }