Merge lp:~unity-team/nux/nux.lazy-load-graphics into lp:nux/2.0

[Jason Smith]

Makes nux lazy load some of its less frequently use, yet more expensive objects

[Thomi Richards (thomir-deactivatedaccount)]

This looks fine to me, but someone who knows nux should look over it as well.

review: Approve

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2012-01-24 23:16:53 +0000
+++ Nux/View.cpp	2012-02-09 06:06:19 +0000
@@ -33,7 +33,6 @@
   View::View(NUX_FILE_LINE_DECL)
     :   InputArea(NUX_FILE_LINE_PARAM)
   {
-    _font = GetSysFont();
     view_layout_ = NULL;
     draw_cmd_queued_        = false;
     m_TextColor         = Color(1.0f, 1.0f, 1.0f, 1.0f);
@@ -369,6 +368,8 @@
 
   ObjectPtr<FontTexture> View::GetFont()
   {
+    if (!_font.IsValid())
+      _font = GetSysFont();
     return _font;
   }
 

=== modified file 'Nux/View.h'
--- Nux/View.h	2012-01-02 21:43:19 +0000
+++ Nux/View.h	2012-02-09 06:06:19 +0000
@@ -166,7 +166,6 @@
     void InitializeLayout();
 
     Color m_TextColor;
-    ObjectPtr<FontTexture> _font;
 
     //! Deprecated. Use GetLayout();
     virtual Layout* GetCompositionLayout();
@@ -201,6 +200,7 @@
     bool full_view_draw_cmd_; //<! True if Draw is called before ContentDraw. It is read-only and can be accessed by calling IsFullRedraw();
 
   private:
+    ObjectPtr<FontTexture> _font;
 
     friend class WindowCompositor;
     friend class Layout;

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-01-23 01:02:28 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-02-09 06:06:19 +0000
@@ -196,31 +196,7 @@
     if (create_rendering_data)
     {
 #ifndef NUX_OPENGLES_20
-      if (UsingGLSLCodePath() &&
-        _graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
-        _graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Vertex_Shader() &&
-        opengl_14_support)
-      {
-        InitSlColorShader();
-        InitSlTextureShader();
-        InitSlPixelateShader();
-        InitSlColorModTexMaskAlpha();
-        InitSl2TextureAdd();
-        InitSl2TextureMod();
-        InitSl4TextureAdd();
-
-        InitSLPower();
-        InitSLAlphaReplicate();
-        InitSLHorizontalGaussFilter();
-        InitSLVerticalGaussFilter();
-        InitSLColorMatrixFilter();
-
-        InitSl2TextureDepRead();
-
-        InitSLHorizontalHQGaussFilter(1);
-        InitSLVerticalHQGaussFilter(1);
-      }
-      else if (_graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
+      if (_graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
         _graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Vertex_Program() &&
         opengl_14_support)
       {
@@ -240,50 +216,6 @@
 
         //InitAsm2TextureDepRead(); // NUXTODO: fix the shader
       }
-#else
-      InitSlColorShader();
-      InitSlTextureShader();
-      InitSlPixelateShader();
-      InitSlColorModTexMaskAlpha();
-      InitSl2TextureAdd();
-      InitSl2TextureMod();
-      InitSl4TextureAdd();
-
-      InitSLPower();
-      InitSLAlphaReplicate();
-      InitSLHorizontalGaussFilter();
-      InitSLVerticalGaussFilter();
-      InitSLColorMatrixFilter();
-#endif
-
-#if defined(NUX_OS_WINDOWS)
-      if (_normal_font.IsNull())
-      {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
-        _normal_font = ObjectPtr<FontTexture> (fnt);
-        fnt->UnReference();
-      }
-
-      if (_bold_font.IsNull())
-      {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
-        _bold_font = ObjectPtr<FontTexture> (fnt);
-        fnt->UnReference();
-      }
-#else
-      if (_normal_font.IsNull())
-      {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
-        _normal_font = ObjectPtr<FontTexture> (fnt);
-        fnt->UnReference();
-      }
-
-      if (_bold_font.IsNull())
-      {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
-        _bold_font = ObjectPtr<FontTexture> (fnt);
-        fnt->UnReference();
-      }
 #endif
 
       GpuInfo& gpu_info = _graphics_display.GetGpuDevice()->GetGpuInfo();
@@ -364,11 +296,41 @@
 
   ObjectPtr<FontTexture> GraphicsEngine::GetFont()
   {
+#if defined(NUX_OS_WINDOWS)
+      if (_normal_font.IsNull())
+      {
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        _normal_font = ObjectPtr<FontTexture> (fnt);
+        fnt->UnReference();
+      }
+#else
+      if (_normal_font.IsNull())
+      {
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        _normal_font = ObjectPtr<FontTexture> (fnt);
+        fnt->UnReference();
+      }
+#endif
     return _normal_font;
   }
 
   ObjectPtr<FontTexture> GraphicsEngine::GetBoldFont()
   {
+    #if defined(NUX_OS_WINDOWS)
+      if (_bold_font.IsNull())
+      {
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        _bold_font = ObjectPtr<FontTexture> (fnt);
+        fnt->UnReference();
+      }
+#else
+      if (_bold_font.IsNull())
+      {
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        _bold_font = ObjectPtr<FontTexture> (fnt);
+        fnt->UnReference();
+      }
+#endif
     return _bold_font;
   }
 

=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
--- NuxGraphics/RenderingPipeGLSL.cpp	2012-01-15 21:45:36 +0000
+++ NuxGraphics/RenderingPipeGLSL.cpp	2012-02-09 06:06:19 +0000
@@ -875,7 +875,8 @@
 
   void GraphicsEngine::QRP_GLSL_Color(int x, int y, int width, int height, const Color &c0, const Color &c1, const Color &c2, const Color &c3)
   {
-    NUX_RETURN_IF_FALSE(m_SlColor.IsValid());
+    if (!m_SlColor.IsValid())
+      InitSlColorShader();
 
     m_quad_tex_stats++;
 
@@ -922,7 +923,8 @@
 
   void GraphicsEngine::QRP_GLSL_1Tex(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> DeviceTexture, TexCoordXForm &texxform0, const Color &color0)
   {
-    NUX_RETURN_IF_FALSE(m_SlTextureModColor.IsValid());
+    if (!m_SlTextureModColor.IsValid())
+        InitSlTextureShader();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, DeviceTexture, texxform0);
@@ -996,7 +998,8 @@
   void GraphicsEngine::QRP_GLSL_ColorModTexAlpha(int x, int y, int width, int height,
       ObjectPtr< IOpenGLBaseTexture> DeviceTexture, TexCoordXForm &texxform, const Color &color)
   {
-    NUX_RETURN_IF_FALSE(m_SlColorModTexMaskAlpha.IsValid());
+    if (!m_SlColorModTexMaskAlpha.IsValid())
+        InitSlColorModTexMaskAlpha();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, DeviceTexture, texxform);
@@ -1083,7 +1086,8 @@
                                        ObjectPtr<IOpenGLBaseTexture> DeviceTexture0, TexCoordXForm &texxform0, const Color &color0,
                                        ObjectPtr<IOpenGLBaseTexture> DeviceTexture1, TexCoordXForm &texxform1, const Color &color1)
   {
-    NUX_RETURN_IF_FALSE(m_Sl2TextureAdd.IsValid());
+    if (!m_Sl2TextureAdd.IsValid())
+        InitSl2TextureAdd();
 
     ObjectPtr<IOpenGLShaderProgram> ShaderProg;
     ShaderProg = m_Sl2TextureAdd;
@@ -1160,7 +1164,8 @@
     ObjectPtr<IOpenGLBaseTexture> distorsion_texture, TexCoordXForm &texxform0, const Color& c0,
     ObjectPtr<IOpenGLBaseTexture> src_device_texture, TexCoordXForm &texxform1, const Color& c1)
   {
-    NUX_RETURN_IF_FALSE(m_Sl2TextureDepRead.IsValid());
+    if (!m_Sl2TextureDepRead.IsValid())
+        InitSl2TextureDepRead();
 
     ObjectPtr<IOpenGLShaderProgram> ShaderProg = m_Sl2TextureDepRead;
 
@@ -1235,7 +1240,8 @@
     ObjectPtr<IOpenGLBaseTexture> DeviceTexture0, TexCoordXForm &texxform0, const Color &color0,
     ObjectPtr<IOpenGLBaseTexture> DeviceTexture1, TexCoordXForm &texxform1, const Color &color1)
   {
-    NUX_RETURN_IF_FALSE(m_Sl2TextureMod.IsValid());
+    if (!m_Sl2TextureMod.IsValid())
+        InitSl2TextureMod();
 
     ObjectPtr<IOpenGLShaderProgram> ShaderProg;
     {
@@ -1315,7 +1321,8 @@
                                        ObjectPtr<IOpenGLBaseTexture> DeviceTexture2, TexCoordXForm &texxform2, const Color &color2,
                                        ObjectPtr<IOpenGLBaseTexture> DeviceTexture3, TexCoordXForm &texxform3, const Color &color3)
   {
-    NUX_RETURN_IF_FALSE(m_Sl4TextureAdd.IsValid());
+    if (!m_Sl4TextureAdd.IsValid())
+        InitSl4TextureAdd();
 
     QRP_Compute_Texture_Coord(width, height, DeviceTexture0, texxform0);
     QRP_Compute_Texture_Coord(width, height, DeviceTexture1, texxform1);
@@ -1431,7 +1438,8 @@
       int x2, int y2,
       Color c0, Color c1, Color c2)
   {
-    NUX_RETURN_IF_FALSE(m_SlColor.IsValid());
+    if (!m_SlColor.IsValid())
+      InitSlColorShader();
 
     float VtxBuffer[] =
     {
@@ -1479,7 +1487,8 @@
   void GraphicsEngine::QRP_GLSL_Line(int x0, int y0,
                                        int x1, int y1, Color c0, Color c1)
   {
-    NUX_RETURN_IF_FALSE(m_SlColor.IsValid());
+    if (!m_SlColor.IsValid())
+      InitSlColorShader();
 
     float VtxBuffer[] =
     {
@@ -1542,7 +1551,8 @@
       Color c2,
       Color c3)
   {
-    NUX_RETURN_IF_FALSE(m_SlColor.IsValid());
+    if (!m_SlColor.IsValid())
+      InitSlColorShader();
 
     float fx0 = x0, fy0 = y0;
     float VtxBuffer[] =
@@ -1605,7 +1615,8 @@
 
   void GraphicsEngine::QRP_GLSL_Power(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color &c0, Vector4 exponent)
   {
-    NUX_RETURN_IF_FALSE(_component_exponentiation_prog.IsValid());
+    if (!_component_exponentiation_prog.IsValid())
+        InitSLPower();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, device_texture, texxform0);
@@ -1671,7 +1682,8 @@
 
   void GraphicsEngine::QRP_GLSL_AlphaReplicate(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color &c0)
   {
-    NUX_RETURN_IF_FALSE(_alpha_replicate_prog.IsValid());
+    if (!_alpha_replicate_prog.IsValid())
+        InitSLAlphaReplicate();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, device_texture, texxform0);
@@ -1734,7 +1746,8 @@
 
   void GraphicsEngine::QRP_GLSL_HorizontalGauss(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color &c0, float sigma)
   {
-    NUX_RETURN_IF_FALSE(_horizontal_gauss_filter_prog.IsValid());
+    if (!_horizontal_gauss_filter_prog.IsValid())
+        InitSLHorizontalGaussFilter();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, device_texture, texxform0);
@@ -1805,7 +1818,8 @@
 
   void GraphicsEngine::QRP_GLSL_VerticalGauss(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm &texxform0, const Color &c0, float sigma)
   {
-    NUX_RETURN_IF_FALSE(_vertical_gauss_filter_prog.IsValid());
+    if (!_vertical_gauss_filter_prog.IsValid())
+        InitSLVerticalGaussFilter();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, device_texture, texxform0);
@@ -2035,7 +2049,8 @@
     Matrix4 color_matrix,
     Vector4 offset)
   {
-    NUX_RETURN_IF_FALSE(_color_matrix_filter_prog.IsValid());
+    if (!_color_matrix_filter_prog.IsValid())
+        InitSLColorMatrixFilter();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, device_texture, texxform0);
@@ -2673,7 +2688,8 @@
 
   void GraphicsEngine::QRP_GLSL_Pixelate(int x, int y, int width, int height, ObjectPtr<IOpenGLBaseTexture> DeviceTexture, TexCoordXForm &texxform0, const Color &color0, int pixel_size)
   {
-    NUX_RETURN_IF_FALSE(m_SLPixelate.IsValid());
+    if (!m_SLPixelate.IsValid())
+        InitSlPixelateShader();
 
     m_quad_tex_stats++;
     QRP_Compute_Texture_Coord(width, height, DeviceTexture, texxform0);