Merge lp:~om26er/ubuntu/oneiric/nux/sru-888039 into lp:ubuntu/oneiric-proposed/nux

[Omer Akram]

this backport should fix a very problematic issue i.e. the performance of the desktop keeps degrading with the use of few hours. This fix have been confirmed to fix that.

[lp:~om26er/ubuntu/oneiric/nux/sru-888039]

55. By Omer Akram on 2012-02-09

fix my dumbness

[Sebastien Bacher (seb128)]

Thank you for your work, I uploaded that, it needs review and approval still though

=== modified file 'NuxGraphics/RunTimeStats.cpp'
--- NuxGraphics/RunTimeStats.cpp	2011-08-18 17:57:09 +0000
+++ NuxGraphics/RunTimeStats.cpp	2012-02-09 15:59:19 +0000
@@ -114,7 +114,9 @@
       }
       case RTTEXTURE:
       {
-        _texture_2d_array.push_back (NUX_STATIC_CAST (IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID() );
+        int id = NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID();
+        if (id)
+          _texture_2d_array.push_back(NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID());
         m_NumTex2D++;
         m_GPUSizeTex2D += GetTextureSize (NUX_REINTERPRET_CAST (IOpenGLBaseTexture *, GraphicsObject) );
         m_TotalGPUSize += m_GPUSizeTex2D;
@@ -122,7 +124,9 @@
       }
       case RTTEXTURERECTANGLE:
       {
-        _texture_rect_array.push_back (NUX_STATIC_CAST (IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID() );
+        int id = NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID();
+        if (id)
+          _texture_rect_array.push_back(NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID());
         m_NumTexRectangle++;
         m_GPUSizeTexRectangle += GetTextureSize (NUX_REINTERPRET_CAST (IOpenGLBaseTexture *, GraphicsObject) );
         m_TotalGPUSize += m_GPUSizeTexRectangle;
@@ -183,11 +187,8 @@
       }
       case RTTEXTURE:
       {
-        std::vector<int>::iterator it;
-        it = std::find (_texture_2d_array.begin(), _texture_2d_array.end(), NUX_STATIC_CAST (IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID() );
-
-        if (it != _texture_2d_array.end() )
-          _texture_2d_array.erase (it);
+        int id = NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID();
+        _texture_2d_array.erase(std::remove(_texture_2d_array.begin(), _texture_2d_array.end(), id), _texture_2d_array.end());
 
         m_NumTex2D--;
         m_GPUSizeTex2D -= GetTextureSize (NUX_REINTERPRET_CAST (IOpenGLBaseTexture *, GraphicsObject) );
@@ -196,11 +197,8 @@
       }
       case RTTEXTURERECTANGLE:
       {
-        std::vector<int>::iterator it;
-        it = std::find (_texture_rect_array.begin(), _texture_rect_array.end(), NUX_STATIC_CAST (IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID() );
-
-        if (it != _texture_rect_array.end() )
-          _texture_rect_array.erase (it);
+        int id = NUX_STATIC_CAST(IOpenGLBaseTexture *, GraphicsObject)->GetOpenGLID();
+        _texture_rect_array.erase(std::remove(_texture_rect_array.begin(), _texture_rect_array.end(), id), _texture_rect_array.end());
 
         m_NumTexRectangle--;
         m_GPUSizeTexRectangle -= GetTextureSize (NUX_REINTERPRET_CAST (IOpenGLBaseTexture *, GraphicsObject) );

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-15 12:50:34 +0000
+++ debian/changelog	2012-02-09 15:59:19 +0000
@@ -1,3 +1,10 @@
+nux (1.16.0-0ubuntu1.2) oneiric-proposed; urgency=low
+
+  * NuxGraphics/RunTimeStats.cpp:
+    - Gradual degradation in desktop performance. (LP: #888039) 
+
+ -- Omer Akram <[e-mail]>  Thu, 09 Feb 2012 20:56:12 +0500
+
 nux (1.16.0-0ubuntu1.1) oneiric-proposed; urgency=low
 
   * NuxGraphics/GraphicsDisplayX11.cpp: