Merge lp:~njpatel/unity/low-graphics-mode-6.0 into lp:unity/6.0

[Neil J. Patel]

Low Graphics Mode

Low Graphics Mode

You can test with UNITY_LOW_GFX_MODE=1 or switch to LLVMPipe

[Nicolas d'Offay (nicolas-doffay)]

Looks good, works perfectly.

review: Approve

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2012-09-07 15:01:14 +0000
+++ launcher/CMakeLists.txt	2012-10-01 15:14:28 +0000
@@ -80,6 +80,7 @@
 
 add_library (launcher-lib STATIC ${LAUNCHER_SOURCES})
 add_dependencies (launcher-lib unity-core-${UNITY_API_VERSION} unity-shared)
+target_link_libraries (launcher-lib unity-shared)
 
 set (SWITCHER_SOURCES
       SwitcherController.cpp

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2012-09-19 06:20:57 +0000
+++ launcher/CairoBaseWindow.cpp	2012-10-01 15:14:28 +0000
@@ -22,6 +22,7 @@
 #include <Nux/WindowCompositor.h>
 
 #include "unity-shared/CairoTexture.h"
+#include "unity-shared/UnitySettings.h"
 #include "CairoBaseWindow.h"
 
 namespace unity
@@ -40,8 +41,9 @@
 NUX_IMPLEMENT_OBJECT_TYPE(CairoBaseWindow);
 
 CairoBaseWindow::CairoBaseWindow() :
-  _use_blurred_background(false),
-  _compute_blur_bkg(false)
+  use_blur_(!Settings::Instance().GetLowGfxMode()),
+  _use_blurred_background(use_blur_),
+  _compute_blur_bkg(use_blur_)
 {
   SetWindowSizeMatchLayout(true);
 }
@@ -91,13 +93,14 @@
 
   gfxContext.PushClippingRectangle(base);
 
-  /* "Clear" out the background */
+  /*"Clear" out the background. Blending is disabled if blur is disabled. This might need to change, but for the moment both classes
+   * which are children of CairoBaseWindow don't have any alpha blending when not using the blurred texture.*/
   nux::ROPConfig rop;
-  rop.Blend = true;
+  rop.Blend = use_blur_;
   rop.SrcBlend = GL_ONE;
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
-  nux::ColorLayer layer(nux::Color(0x00000000), true, rop);
+  nux::ColorLayer layer(nux::Color(0x00000000), use_blur_, rop);
   nux::GetPainter().PushDrawLayer(gfxContext, base, &layer);
 
   nux::TexCoordXForm texxform_bg;
@@ -107,14 +110,14 @@
   nux::TexCoordXForm texxform_mask;
   texxform_mask.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
   texxform_mask.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+  
+  nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetBlend(true);
+  nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
   if (bg_blur_texture_.IsValid() && texture_mask_.IsValid())
   {
     nux::TexCoordXForm texxform_blur_bkg;
 
-    nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetBlend(true);
-    nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
     gfxContext.QRP_2TexMod(
       base.x,
       base.y,
@@ -130,9 +133,6 @@
 
   if (texture_bg_.IsValid() && texture_mask_.IsValid())
   {
-    nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetBlend(true);
-    nux::GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
     gfxContext.QRP_2TexMod(base.x,
                            base.y,
                            base.width,
@@ -150,9 +150,6 @@
     nux::TexCoordXForm texxform;
     texxform.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
     texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-    nux::GetWindowThread()->GetGraphicsDisplay().GetGraphicsEngine()->GetRenderStates().SetBlend(true);
-    nux::GetWindowThread()->GetGraphicsDisplay().GetGraphicsEngine()->GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
     
     gfxContext.QRP_1Tex(base.x,
                         base.y,

=== modified file 'launcher/CairoBaseWindow.h'
--- launcher/CairoBaseWindow.h	2012-05-07 19:52:54 +0000
+++ launcher/CairoBaseWindow.h	2012-10-01 15:14:28 +0000
@@ -39,6 +39,7 @@
   nux::ObjectPtr<nux::BaseTexture> texture_mask_;
   nux::ObjectPtr<nux::BaseTexture> texture_outline_;
 
+  bool use_blur_;
   bool _use_blurred_background;
   bool _compute_blur_bkg;
 

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-09-24 09:43:57 +0000
+++ launcher/Launcher.cpp	2012-10-01 15:14:28 +0000
@@ -50,6 +50,7 @@
 #include "unity-shared/WindowManager.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
+#include "unity-shared/UnitySettings.h"
 
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
@@ -1758,14 +1759,25 @@
     _render_drag_window = false;
     ShowDragWindow();
   }
+  
+  nux::Color clear_colour = nux::Color(0x00000000);
+  
+  if (Settings::Instance().GetLowGfxMode())
+  {
+    clear_colour = _background_color;
+    clear_colour.alpha = 1.0f;
+  }
 
   // clear region
   GfxContext.PushClippingRectangle(base);
-  gPainter.PushDrawColorLayer(GfxContext, base, nux::Color(0x00000000), true, ROP);
+  gPainter.PushDrawColorLayer(GfxContext, base, clear_colour, true, ROP);
 
-  GfxContext.GetRenderStates().SetBlend(true);
-  GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-  GfxContext.GetRenderStates().SetColorMask(true, true, true, true);
+  if (Settings::Instance().GetLowGfxMode() == false)
+  {
+    GfxContext.GetRenderStates().SetBlend(true);
+    GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+    GfxContext.GetRenderStates().SetColorMask(true, true, true, true);
+  }
 
   int push_count = 1;
 
@@ -1794,92 +1806,95 @@
                         pressure_color);
   }
 
-  if (IsOverlayOpen())
+  if (Settings::Instance().GetLowGfxMode() == false)
   {
-    nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
-    nux::ObjectPtr<nux::IOpenGLBaseTexture> blur_texture;
-
-    if (BackgroundEffectHelper::blur_type != unity::BLUR_NONE && (bkg_box.x + bkg_box.width > 0))
-    {
-      blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
-    }
-    else
-    {
-      blur_texture = bg_effect_helper_.GetRegion(blur_geo);
-    }
-
-    if (blur_texture.IsValid())
-    {
-      nux::TexCoordXForm texxform_blur_bg;
-      texxform_blur_bg.flip_v_coord = true;
-      texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-      texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
-      texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
-
-      GfxContext.PushClippingRectangle(bkg_box);
+    if (IsOverlayOpen())
+    {
+      nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
+      nux::ObjectPtr<nux::IOpenGLBaseTexture> blur_texture;
+
+      if (BackgroundEffectHelper::blur_type != unity::BLUR_NONE && (bkg_box.x + bkg_box.width > 0))
+      {
+	blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
+      }
+      else
+      {
+	blur_texture = bg_effect_helper_.GetRegion(blur_geo);
+      }
+
+      if (blur_texture.IsValid())
+      {
+	nux::TexCoordXForm texxform_blur_bg;
+	texxform_blur_bg.flip_v_coord = true;
+	texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+	texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
+	texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
+
+	GfxContext.PushClippingRectangle(bkg_box);
 
 #ifndef NUX_OPENGLES_20
-      if (GfxContext.UsingGLSLCodePath())
-        gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                          blur_texture,
-                                          texxform_blur_bg,
-                                          nux::color::White,
-                                          _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                          true, ROP);
-      else
-        gPainter.PushDrawTextureLayer(GfxContext, base,
-                                      blur_texture,
-                                      texxform_blur_bg,
-                                      nux::color::White,
-                                      true,
-                                      ROP);
+	if (GfxContext.UsingGLSLCodePath())
+	  gPainter.PushDrawCompositionLayer(GfxContext, base,
+					    blur_texture,
+					    texxform_blur_bg,
+					    nux::color::White,
+					    _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+					    true, ROP);
+	else
+	  gPainter.PushDrawTextureLayer(GfxContext, base,
+					blur_texture,
+					texxform_blur_bg,
+					nux::color::White,
+					true,
+					ROP);
 #else
-        gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                          blur_texture,
-                                          texxform_blur_bg,
-                                          nux::color::White,
-                                          _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                          true, ROP);
+	  gPainter.PushDrawCompositionLayer(GfxContext, base,
+					    blur_texture,
+					    texxform_blur_bg,
+					    nux::color::White,
+					    _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+					    true, ROP);
 #endif
-      GfxContext.PopClippingRectangle();
-
-      push_count++;
-    }
-
-    unsigned int alpha = 0, src = 0, dest = 0;
-    GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-
-    // apply the darkening
-    GfxContext.GetRenderStates().SetBlend(true, GL_ZERO, GL_SRC_COLOR);
-    gPainter.Paint2DQuadColor(GfxContext, bkg_box, nux::Color(0.9f, 0.9f, 0.9f, 1.0f));
-    GfxContext.GetRenderStates().SetBlend (alpha, src, dest);
-
-    // apply the bg colour
+	GfxContext.PopClippingRectangle();
+
+	push_count++;
+      }
+
+      unsigned int alpha = 0, src = 0, dest = 0;
+      GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+
+      // apply the darkening
+      GfxContext.GetRenderStates().SetBlend(true, GL_ZERO, GL_SRC_COLOR);
+      gPainter.Paint2DQuadColor(GfxContext, bkg_box, nux::Color(0.9f, 0.9f, 0.9f, 1.0f));
+      GfxContext.GetRenderStates().SetBlend (alpha, src, dest);
+
+      // apply the bg colour
 #ifndef NUX_OPENGLES_20
-    if (GfxContext.UsingGLSLCodePath() == false)
-      gPainter.Paint2DQuadColor(GfxContext, bkg_box, _background_color);
+      if (GfxContext.UsingGLSLCodePath() == false)
+	gPainter.Paint2DQuadColor(GfxContext, bkg_box, _background_color);
 #endif
 
-    // apply the shine
-    GfxContext.GetRenderStates().SetBlend(true, GL_DST_COLOR, GL_ONE);
-    nux::TexCoordXForm texxform;
-    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-    texxform.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
-    texxform.uoffset = (1.0f / launcher_sheen_->GetWidth()); // TODO (gord) don't use absolute values here
-    texxform.voffset = (1.0f / launcher_sheen_->GetHeight()) * panel::Style::Instance().panel_height;
-    GfxContext.QRP_1Tex(base.x, base.y, base.width, base.height,
-                        launcher_sheen_->GetDeviceTexture(),
-                        texxform,
-                        nux::color::White);
+      // apply the shine
+      GfxContext.GetRenderStates().SetBlend(true, GL_DST_COLOR, GL_ONE);
+      nux::TexCoordXForm texxform;
+      texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
+      texxform.uoffset = (1.0f / launcher_sheen_->GetWidth()); // TODO (gord) don't use absolute values here
+      texxform.voffset = (1.0f / launcher_sheen_->GetHeight()) * panel::Style::Instance().panel_height;
+      GfxContext.QRP_1Tex(base.x, base.y, base.width, base.height,
+			  launcher_sheen_->GetDeviceTexture(),
+			  texxform,
+			  nux::color::White);
 
-    //reset the blend state
-    GfxContext.GetRenderStates().SetBlend (alpha, src, dest);
-  }
-  else
-  {
-    nux::Color color = _background_color;
-    color.alpha = options()->background_alpha;
-    gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
+      //reset the blend state
+      GfxContext.GetRenderStates().SetBlend (alpha, src, dest);
+    }
+    else
+    {
+      nux::Color color = _background_color;
+      color.alpha = options()->background_alpha;
+      gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
+    }
   }
 
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-09-18 18:53:43 +0000
+++ launcher/Launcher.h	2012-10-01 15:14:28 +0000
@@ -43,7 +43,6 @@
 #include "unity-shared/UBusWrapper.h"
 #include "SoftwareCenterLauncherIcon.h"
 
-
 namespace unity
 {
 namespace launcher

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistView.cpp	2012-10-01 15:14:28 +0000
@@ -40,9 +40,11 @@
 #include "QuicklistMenuItemRadio.h"
 
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/UnitySettings.h"
 
 #include "unity-shared/ubus-server.h"
 #include "unity-shared/UBusMessages.h"
+#include "unity-shared/DashStyle.h"
 
 namespace unity
 {
@@ -71,9 +73,6 @@
 {
   SetGeometry(nux::Geometry(0, 0, 1, 1));
 
-  _use_blurred_background = true;
-  _compute_blur_bkg = true;
-
   _left_space = new nux::SpaceLayout(_padding +
                                      _anchor_width +
                                      _corner_radius +
@@ -1222,8 +1221,18 @@
   float   shadow_color[4]  = {0.0f, 0.0f, 0.0f, 1.00f};
   float   outline_color[4] = {1.0f, 1.0f, 1.0f, 0.40f};
   float   mask_color[4]    = {1.0f, 1.0f, 1.0f, 1.00f};
-//   float   anchor_width      = 10;
-//   float   anchor_height     = 18;
+  
+  if (Settings::Instance().GetLowGfxMode())
+  {
+    float alpha_value = 1.0f;
+    
+    tint_color[3] = alpha_value;
+    hl_color[3] = 0.2f;
+    dot_color[3] = 0.0f;
+    shadow_color[3] = alpha_value;
+    outline_color[3] = alpha_value;
+    mask_color[3] = alpha_value;
+  }
 
   ql_tint_dot_hl(cr_bg,
                  width,

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2012-05-07 22:28:17 +0000
+++ launcher/Tooltip.cpp	2012-10-01 15:14:28 +0000
@@ -26,6 +26,7 @@
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/ubus-server.h"
 #include "unity-shared/UBusMessages.h"
+#include <unity-shared/UnitySettings.h>
 
 #include "Tooltip.h"
 
@@ -49,9 +50,6 @@
   _labelText(TEXT("Unity")),
   _cairo_text_has_changed(true)
 {
-  _use_blurred_background = true;
-  _compute_blur_bkg = true;
-
   _hlayout = new nux::HLayout(TEXT(""), NUX_TRACKER_LOCATION);
   _vlayout = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
 
@@ -461,6 +459,19 @@
   float   shadow_color[4]  = {0.0f, 0.0f, 0.0f, 1.00f};
   float   outline_color[4] = {1.0f, 1.0f, 1.0f, 0.15f};
   float   mask_color[4]    = {1.0f, 1.0f, 1.0f, 1.00f};
+  
+  if (use_blur_ == false)
+  {
+    //If low gfx is detected then disable transparency because we're not bluring using our blur anymore.
+    float alpha_value = 1.0f;
+  
+    tint_color[3] = alpha_value;
+    hl_color[3] = alpha_value;
+    dot_color[3] = alpha_value;
+    shadow_color[3] = alpha_value;
+    outline_color[3] = alpha_value;
+    mask_color[3] = alpha_value;
+  }
 
   tint_dot_hl(cr_bg,
               width,

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2012-09-13 16:12:19 +0000
+++ panel/PanelView.cpp	2012-10-01 15:14:28 +0000
@@ -71,10 +71,22 @@
 
   nux::ROPConfig rop;
   rop.Blend = true;
-  rop.SrcBlend = GL_ZERO;
-  rop.DstBlend = GL_SRC_COLOR;
+  nux::Color darken_colour = nux::Color(0.9f, 0.9f, 0.9f, 1.0f);
+  
+  if (Settings::Instance().GetLowGfxMode() == false)
+  {
+    rop.SrcBlend = GL_ZERO;
+    rop.DstBlend = GL_SRC_COLOR;
+  }
+  //If we are in low gfx mode then change our darken_colour to our background colour.
+  else
+  {
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+    darken_colour = _bg_color;
+  }
 
-  _bg_darken_layer.reset(new nux::ColorLayer(nux::Color(0.9f, 0.9f, 0.9f, 1.0f), false, rop));
+  _bg_darken_layer.reset(new nux::ColorLayer(darken_colour, false, rop));
 
   _layout = new nux::HLayout("", NUX_TRACKER_LOCATION);
   _layout->SetContentDistribution(nux::eStackLeft);
@@ -386,13 +398,13 @@
       GfxContext.PopClippingRectangle();
     }
 
-    if (_overlay_is_open)
+    if (_overlay_is_open && Settings::Instance().GetLowGfxMode() == false)
     {
       nux::GetPainter().RenderSinglePaintLayer(GfxContext, geo, _bg_darken_layer.get());
-    
+      
       GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
       nux::TexCoordXForm refine_texxform;
-      
+  
       int refine_x_pos = geo.x + (_stored_dash_width - refine_gradient_midpoint);
 
       refine_x_pos += _launcher_width;
@@ -411,8 +423,8 @@
                           _bg_refine_single_column_tex->GetDeviceTexture(),
                           refine_texxform,
                           nux::color::White);
+      }
     }
-  }
 
   if (!_overlay_is_open || GfxContext.UsingGLSLCodePath() == false)
     nux::GetPainter().RenderSinglePaintLayer(GfxContext, geo, _bg_layer.get());
@@ -484,6 +496,12 @@
 
     if (_overlay_is_open)
     {
+      if (Settings::Instance().GetLowGfxMode())
+      {
+	rop.Blend = false;
+	_bg_darken_layer.reset(new nux::ColorLayer(_bg_color, false, rop));
+      }
+      
       nux::GetPainter().PushLayer(GfxContext, geo, _bg_darken_layer.get());
       bgs++;
       
@@ -495,22 +513,25 @@
       refine_geo.x = refine_x_pos;
       refine_geo.width = _bg_refine_tex->GetWidth();
       refine_geo.height = _bg_refine_tex->GetHeight();
-
-      nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_layer.get());
-      bgs++;
-
-      refine_geo.x += refine_geo.width;
-      refine_geo.width = geo.width;
-      refine_geo.height = geo.height;
-      nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_single_column_layer.get());
-      bgs++;
+      
+      if (Settings::Instance().GetLowGfxMode() == false)
+      {
+	nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_layer.get());
+	bgs++;
+
+	refine_geo.x += refine_geo.width;
+	refine_geo.width = geo.width;
+	refine_geo.height = geo.height;
+	nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_single_column_layer.get());
+	bgs++;
+      }
     }
   }
 
   if (!_overlay_is_open || GfxContext.UsingGLSLCodePath() == false)
     gPainter.PushLayer(GfxContext, geo, _bg_layer.get());
 
-  if (_overlay_is_open)
+  if (_overlay_is_open && Settings::Instance().GetLowGfxMode() == false)
   {
     // apply the shine
     nux::TexCoordXForm texxform;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-28 22:33:55 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-01 15:14:28 +0000
@@ -200,6 +200,18 @@
       failed = true;
     }
   }
+  
+    //In case of software rendering then enable lowgfx mode.
+  std::string renderer = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_RENDERER)));
+  
+  if (strstr(renderer.c_str(), "Software Rasterizer") ||
+      strstr(renderer.c_str(), "Mesa X11") ||
+      strstr(renderer.c_str(), "LLVM") ||
+      strstr(renderer.c_str(), "on softpipe") ||
+      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1))
+      {
+        Settings::Instance().SetLowGfxMode(true);
+      }
 #endif
 
   if (!failed)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-09-20 03:22:01 +0000
+++ tests/CMakeLists.txt	2012-10-01 15:14:28 +0000
@@ -72,7 +72,7 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/panel-marshal.c
                 ${CMAKE_SOURCE_DIR}/unity-shared/ubus-server.cpp
                 )
-target_link_libraries (test-unit ${LIBS})
+target_link_libraries (test-unit unity-shared ${LIBS})
 add_dependencies (test-unit unity-core-${UNITY_API_VERSION})
 add_subdirectory (test-input-remover)
 add_subdirectory (test-minimize-window-handler)
@@ -111,7 +111,7 @@
                  test_service_main.c
                  test_service_model.c
                  test_service_model.h)
-  target_link_libraries(test-gtest-service ${LIBS})
+  target_link_libraries(test-gtest-service unity-shared ${LIBS})
   add_dependencies (test-gtest-service unity-core-${UNITY_API_VERSION} gtest)
 
 
@@ -176,7 +176,7 @@
                  ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
                  ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
                  )
-  target_link_libraries(test-gtest-xless gtest ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS})
+  target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS})
   add_test(UnityGTestXless test-gtest-xless)
   add_dependencies(test-gtest-xless unity-core-${UNITY_API_VERSION} gtest)
 
@@ -194,7 +194,7 @@
                  test_ratings_filter.cpp
                  test_results.cpp
                 )
-  target_link_libraries(test-gtest-dbus gtest ${LIBS})
+  target_link_libraries(test-gtest-dbus gtest unity-shared ${LIBS})
   add_test(UnityGTestDBus test-gtest-dbus)
   add_dependencies(test-gtest-dbus unity-core-${UNITY_API_VERSION} test-gtest-service gtest)
 
@@ -361,7 +361,7 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/ubus-server.cpp
                  ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
                 )
-  target_link_libraries(test-gtest gtest gmock ${LIBS})
+  target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS})
   add_test(UnityGTest test-gtest)
   add_dependencies(test-gtest unity-core-${UNITY_API_VERSION} gtest gmock)
 

=== modified file 'unity-shared/BackgroundEffectHelper.cpp'
--- unity-shared/BackgroundEffectHelper.cpp	2012-05-06 23:48:38 +0000
+++ unity-shared/BackgroundEffectHelper.cpp	2012-10-01 15:14:28 +0000
@@ -31,6 +31,7 @@
 
 #include <X11/Xregion.h>
 #include <boost/utility.hpp>
+#include "UnitySettings.h"
 
 
 using namespace unity;
@@ -52,6 +53,11 @@
   cache_dirty = true;
   enabled.changed.connect (sigc::mem_fun(this, &BackgroundEffectHelper::OnEnabledChanged));
   noise_texture_ = nux::CreateTextureFromFile(PKGDATADIR"/dash_noise.png");
+  
+  if (Settings::Instance().GetLowGfxMode())
+  {
+    blur_type(BLUR_NONE);
+  }
 
   Register(this);
 }

=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2012-09-20 12:52:02 +0000
+++ unity-shared/DashStyle.h	2012-10-01 15:14:28 +0000
@@ -245,6 +245,8 @@
   int GetCategoryHeaderLeftPadding() const;
   int GetCategorySeparatorLeftPadding() const;
   int GetCategorySeparatorRightPadding() const;
+  
+  bool GetUseBlur() const;
 
 
   sigc::signal<void> changed;

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2012-09-17 00:39:31 +0000
+++ unity-shared/OverlayRenderer.cpp	2012-10-01 15:14:28 +0000
@@ -109,7 +109,7 @@
 }
 
 void OverlayRendererImpl::Init()
-{
+{  
   nux::ROPConfig rop;
   rop.Blend = true;
   rop.SrcBlend = GL_ONE;
@@ -140,7 +140,18 @@
   rop.Blend = true;
   rop.SrcBlend = GL_ZERO;
   rop.DstBlend = GL_SRC_COLOR;
-  bg_darken_layer_ = new nux::ColorLayer(nux::Color(0.9f, 0.9f, 0.9f, 1.0f), false, rop);
+  nux::Color darken_colour = nux::Color(0.9f, 0.9f, 0.9f, 1.0f);
+  
+  //When we are in low gfx mode then our darken layer will act as a background.
+  if (Settings::Instance().GetLowGfxMode())
+  {
+    rop.Blend = false;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_SRC_COLOR;
+    darken_colour = bg_color_;
+  }
+  
+  bg_darken_layer_ = new nux::ColorLayer(darken_colour, false, rop);
   bg_shine_texture_ = unity::dash::Style::Instance().GetDashShine()->GetDeviceTexture();
 
   ubus_manager_.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
@@ -435,7 +446,6 @@
 
 void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry, bool force_edges)
 {
-  bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
   nux::Geometry geo(content_geo);
 
   int excess_border = (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges) ? EXCESS_BORDER : 0;
@@ -456,7 +466,8 @@
   texxform_absolute_bg.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
 
   nux::Geometry blur_geo(larger_absolute_geo.x, larger_absolute_geo.y, larger_content_geo.width, larger_content_geo.height);
-  if (paint_blur)
+  
+  if (BackgroundEffectHelper::blur_type != BLUR_NONE)
   {
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
   }
@@ -493,14 +504,14 @@
 
     gfx_context.PopClippingRectangle();
   }
-
-  // Draw the left and top lines
+  
+  //Draw the left and top lines.
   dash::Style& style = dash::Style::Instance();
-
+    
   gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
   gfx_context.GetRenderStates().SetBlend(true);
   gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
+  
   const double line_opacity = 0.1f;
   const int gradient_height = 50;
   const int vertical_padding = 20;
@@ -514,9 +525,9 @@
   // Vertical lancher/dash separator
   nux::GetPainter().Paint2DQuadColor(gfx_context,
                                      nux::Geometry(geometry.x,
-                                                   geometry.y + vertical_padding,
-                                                   style.GetVSeparatorSize(),
-                                                   gradient_height),
+                                     geometry.y + vertical_padding,
+                                     style.GetVSeparatorSize(),
+                                     gradient_height),
                                      nux::color::Transparent,
                                      line_color * 0.7f, // less opacity
                                      line_color * 0.7f, // less opacity
@@ -528,10 +539,16 @@
                                geometry.y + content_geo.height + INNER_CORNER_RADIUS + corner_overlap,
                                line_color * 0.7f); // less opacity
 
-  // Draw the background
+  if (Settings::Instance().GetLowGfxMode())
+  {
+    bg_darken_layer_->SetColor(bg_color_);
+  }
+  //Draw the background
   bg_darken_layer_->SetGeometry(larger_content_geo);
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, larger_content_geo, bg_darken_layer_);
 
+  if (Settings::Instance().GetLowGfxMode() == false)
+  {
 #ifndef NUX_OPENGLES_20
   if (gfx_context.UsingGLSLCodePath() == false)
   {
@@ -547,9 +564,9 @@
   gfx_context.GetRenderStates().SetColorMask(true, true, true, false);
   gfx_context.GetRenderStates().SetBlend(true, GL_DST_COLOR, GL_ONE);
 
-  gfx_context.QRP_1Tex (larger_content_geo.x, larger_content_geo.y,
-                        larger_content_geo.width, larger_content_geo.height,
-                        bg_shine_texture_, texxform_absolute_bg, nux::color::White);
+  gfx_context.QRP_1Tex(larger_content_geo.x, larger_content_geo.y,
+                       larger_content_geo.width, larger_content_geo.height,
+                       bg_shine_texture_, texxform_absolute_bg, nux::color::White);
 
   gfx_context.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
   nux::TexCoordXForm refine_texxform;
@@ -557,26 +574,26 @@
   if (refine_is_open_)
   { 
     gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_tex_->GetWidth(), 
-                       larger_content_geo.y,
-                       bg_refine_tex_->GetWidth(), 
-                       std::min(bg_refine_tex_->GetHeight(), larger_content_geo.height),
-                       bg_refine_tex_->GetDeviceTexture(),
-                       refine_texxform,
-                       nux::color::White
-                       );
+			  larger_content_geo.y,
+			  bg_refine_tex_->GetWidth(), 
+			  std::min(bg_refine_tex_->GetHeight(), larger_content_geo.height),
+			  bg_refine_tex_->GetDeviceTexture(),
+			  refine_texxform,
+			  nux::color::White
+			  );
   }
   else
   {
-    gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_no_refine_tex_->GetWidth(), 
-                       larger_content_geo.y,
-                       bg_refine_no_refine_tex_->GetWidth(), 
-                       std::min(bg_refine_no_refine_tex_->GetHeight(), larger_content_geo.height),
-                       bg_refine_no_refine_tex_->GetDeviceTexture(),
-                       refine_texxform,
-                       nux::color::White
-                       );
+   gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_no_refine_tex_->GetWidth(), 
+			 larger_content_geo.y,
+			 bg_refine_no_refine_tex_->GetWidth(), 
+			 std::min(bg_refine_no_refine_tex_->GetHeight(), larger_content_geo.height),
+			 bg_refine_no_refine_tex_->GetDeviceTexture(),
+			 refine_texxform,
+			 nux::color::White
+			 );
   }
-
+}
 
   if (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges)
   {
@@ -606,7 +623,7 @@
 
       geo.width += corner->GetWidth() - 10;
       geo.height += corner->GetHeight() - 10;
-      {
+      { 
         // Corner
         texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
         texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
@@ -708,7 +725,7 @@
                              texxform,
                              nux::color::White);
 
-        gfx_context.GetRenderStates().SetBlend(true);
+        gfx_context.GetRenderStates().SetBlend(false);
         gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
         gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
 
@@ -903,21 +920,25 @@
   }
 #endif
 
-  // apply the shine
-  rop.Blend = true;
-  rop.SrcBlend = GL_DST_COLOR;
-  rop.DstBlend = GL_ONE;
-  texxform_absolute_bg.flip_v_coord = false;
-  texxform_absolute_bg.uoffset = (1.0f / bg_shine_texture_->GetWidth()) * parent->x_offset;
-  texxform_absolute_bg.voffset = (1.0f / bg_shine_texture_->GetHeight()) * parent->y_offset;
+  //Only apply shine if we aren't in low gfx mode.
+  if (Settings::Instance().GetLowGfxMode() == false)
+  {
+    rop.Blend = true;
+    rop.SrcBlend = GL_DST_COLOR;
+    rop.DstBlend = GL_ONE;
+    texxform_absolute_bg.flip_v_coord = false;
+    texxform_absolute_bg.uoffset = (1.0f / bg_shine_texture_->GetWidth()) * parent->x_offset;
+    texxform_absolute_bg.voffset = (1.0f / bg_shine_texture_->GetHeight()) * parent->y_offset;
+    nux::Color shine_colour = nux::color::White;
 
-  nux::GetPainter().PushTextureLayer(gfx_context, larger_content_geo,
-                                     bg_shine_texture_,
-                                     texxform_absolute_bg,
-                                     nux::color::White,
-                                     false,
-                                     rop);
-  bgs++;
+    nux::GetPainter().PushTextureLayer(gfx_context, larger_content_geo,
+                                      bg_shine_texture_,
+                                      texxform_absolute_bg,
+                                      shine_colour,
+                                      true,
+                                      rop);
+    bgs++;
+  }
 
   nux::Geometry refine_geo = larger_content_geo;
   

=== modified file 'unity-shared/OverlayRenderer.h'
--- unity-shared/OverlayRenderer.h	2012-05-06 23:48:38 +0000
+++ unity-shared/OverlayRenderer.h	2012-10-01 15:14:28 +0000
@@ -86,7 +86,6 @@
 
 private:
   OverlayRendererImpl *pimpl_;
-
 };
 
 }

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2012-09-17 09:26:59 +0000
+++ unity-shared/UnitySettings.cpp	2012-10-01 15:14:28 +0000
@@ -48,6 +48,7 @@
     : parent_(owner)
     , gsettings_(g_settings_new(SETTINGS_NAME.c_str()))
     , cached_form_factor_(FormFactor::DESKTOP)
+    , lowGfx_(false)
   {
     CacheFormFactor();
 
@@ -89,6 +90,7 @@
   Settings* parent_;
   glib::Object<GSettings> gsettings_;
   FormFactor cached_form_factor_;
+  bool lowGfx_;
 
   glib::Signal<void, GSettings*, gchar* > form_factor_changed_;
 };
@@ -105,8 +107,9 @@
   {
     LOG_ERROR(logger) << "More than one unity::Settings created.";
   }
+  
   else
-  {
+  { 
     form_factor.SetGetterFunction(sigc::mem_fun(*pimpl, &Impl::GetFormFactor));
     form_factor.SetSetterFunction(sigc::mem_fun(*pimpl, &Impl::SetFormFactor));
 
@@ -130,5 +133,14 @@
   return *settings_instance;
 }
 
+bool Settings::GetLowGfxMode() const
+{
+  return pimpl->lowGfx_;
+}
+
+void Settings::SetLowGfxMode(const bool low_gfx)
+{
+  pimpl->lowGfx_ = low_gfx;
+}
 
 } // namespace unity

=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2012-09-17 09:26:59 +0000
+++ unity-shared/UnitySettings.h	2012-10-01 15:14:28 +0000
@@ -42,6 +42,8 @@
   ~Settings();
 
   static Settings& Instance();
+  bool GetLowGfxMode() const;
+  void SetLowGfxMode(const bool low_gfx);
 
   nux::RWProperty<FormFactor> form_factor;
   nux::Property<bool> is_standalone;