Merge lp:~vanvugt/nux/fix-888039-nux1.0 into lp:nux/1.0

[Daniel van Vugt]

Fix gradual degradation in desktop performance caused by an ever-growing vector<int> filling with zeros. (LP: #888039)

This is a backport of Jason Smith's fix that is already upstream in Nux 2.0.

[Omer Akram (om26er)]

I would happily work on the SRU when this gets approved and merged :)

[Jay Taoko (jaytaoko)]

review: Approve

[Tim Penhey (thumper)]

Approving to take the team review from pending :)

review: Approve

=== modified file 'NuxGraphics/RunTimeStats.cpp'
--- NuxGraphics/RunTimeStats.cpp	2011-09-20 06:03:43 +0000
+++ NuxGraphics/RunTimeStats.cpp	2012-02-08 04:01:18 +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) );