Merge lp:~bregma/compiz/lp-1227449 into lp:compiz/0.9.12

[Stephen M. Webb]

opengl plugin: free shaders and uniforms

Frees shaders and uniforms (which were previously always just leaked). Since these are mostly cached there won't be much effect at runtime (unless a third-party plugin is doing something wacky, which is allowed) but will definitely reduce the noise from valgrind.

The only real way to test this change is to run valgrind on Compiz before and after applying the patch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3890
http://jenkins.qa.ubuntu.com/job/compiz-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/6/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'plugins/opengl/include/opengl/shadercache.h'
--- plugins/opengl/include/opengl/shadercache.h	2013-01-09 10:45:16 +0000
+++ plugins/opengl/include/opengl/shadercache.h	2014-10-30 12:51:30 +0000
@@ -69,9 +69,14 @@
  */
 struct GLShaderData
 {
+    GLShaderData(const std::string &name,
+                 const std::string &vertexShader,
+                 const std::string &fragmentShader);
+
     std::string name;
     std::string vertexShader;
     std::string fragmentShader;
+    bool        isCached;
 };
 
 class PrivateShaderCache;

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2013-07-22 17:19:59 +0000
+++ plugins/opengl/src/paint.cpp	2014-10-30 12:51:30 +0000
@@ -1298,6 +1298,15 @@
 	priv->vertexBuffer->render (transform, attrib);
     #endif
 
+    for (std::list<const GLShaderData*>::const_iterator it = priv->shaders.begin();
+         it != priv->shaders.end();
+         ++it)
+    {
+	if ((*it)->isCached != true)
+	{
+	    delete *it;
+	}
+    }
     priv->shaders.clear ();
     texture->disable ();
 

=== modified file 'plugins/opengl/src/shadercache.cpp'
--- plugins/opengl/src/shadercache.cpp	2013-12-04 01:31:52 +0000
+++ plugins/opengl/src/shadercache.cpp	2014-10-30 12:51:30 +0000
@@ -40,6 +40,16 @@
 
 };
 
+GLShaderData::GLShaderData(const std::string &name,
+                           const std::string &vertexShader,
+                           const std::string &fragmentShader) :
+    name(name),
+    vertexShader(vertexShader),
+    fragmentShader(fragmentShader),
+    isCached(false)
+{
+}
+
 typedef std::map<GLShaderParameters, GLShaderData, GLShaderParametersComparer> ShaderMapType;
 
 /** 
@@ -125,11 +135,10 @@
 ShaderMapType::const_iterator
 PrivateShaderCache::addShaderData (const GLShaderParameters &params)
 {
-    GLShaderData shaderData;
-
-    shaderData.name = params.id ();
-    shaderData.fragmentShader = createFragmentShader (params);
-    shaderData.vertexShader = createVertexShader (params);
+    GLShaderData shaderData (params.id (),
+                             createVertexShader (params),
+                             createFragmentShader (params));
+    shaderData.isCached = true;
 
     std::pair<ShaderMapType::iterator, bool> ret =
         shaderMap.insert(std::pair<GLShaderParameters, GLShaderData>(params,shaderData));

=== modified file 'plugins/opengl/src/vertexbuffer.cpp'
--- plugins/opengl/src/vertexbuffer.cpp	2013-03-31 19:27:26 +0000
+++ plugins/opengl/src/vertexbuffer.cpp	2014-10-30 12:51:30 +0000
@@ -88,6 +88,12 @@
     priv->maxVertices = -1;
     priv->normalData.clear ();
     priv->colorData.clear ();
+    for (std::vector<AbstractUniform*>::iterator it = priv->uniforms.begin();
+	 it != priv->uniforms.end();
+	 ++it)
+    {
+	delete *it;
+    }
     priv->uniforms.clear ();
 
     priv->nTextures = 0;
@@ -412,6 +418,12 @@
 	GL::deleteBuffers (1, &colorBuffer);
     if (textureBuffers[0])
 	GL::deleteBuffers (4, &textureBuffers[0]);
+    for (std::vector<AbstractUniform*>::iterator it = uniforms.begin();
+	 it != uniforms.end();
+	 ++it)
+    {
+	delete *it;
+    }
 }
 
 int PrivateVertexBuffer::render (const GLMatrix            *projection,

=== modified file 'plugins/opengl/src/window.cpp'
--- plugins/opengl/src/window.cpp	2013-06-20 09:22:02 +0000
+++ plugins/opengl/src/window.cpp	2014-10-30 12:51:30 +0000
@@ -362,11 +362,9 @@
                       std::string vertex_shader,
                       std::string fragment_shader)
 {
-    GLShaderData *data = new GLShaderData;
-    data->name = name;
-    data->vertexShader = vertex_shader;
-    data->fragmentShader = fragment_shader;
-
+    GLShaderData *data = new GLShaderData (name,
+                                           vertex_shader,
+                                           fragment_shader);
     priv->shaders.push_back(data);
 }