Merge lp:~vanvugt/compiz/fix-1097664 into lp:compiz/0.9.9

[Daniel van Vugt]

Avoid leaking GLShaderCache::priv (LP: #1097664)

I have bumped the opengl ABI for completeness but it's probably not necessary
because:
  (a) No code outside of the opengl plugin uses GLShaderCache; and
  (b) Even if there was code using it, I'm not sure if the addition of a
      non-virtual destructor would affect the binary object size.

[Sam Spilsbury (smspillaz)]

I don't think adding a destructor will break the ABI, as one is generated automatically. Its only if you are overloading a virtual destructor, or adding one.

In any case, the best way to handle this problem is to use either unique_ptr or auto_ptr for the pimpl. I know, templates are evil in the eyes of some. Its not that evil and saves time if someone accidentally removes the appropriate delete from the destructor one day.

review: Approve

[Sam Spilsbury (smspillaz)]

s/adding one/adding a virtual destructor/.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3550
http://jenkins.qa.ubuntu.com/job/compiz-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/356/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/356//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3550
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/7/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/7//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3550
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/8/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/8//rebuild/?

review: Approve (continuous-integration)

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2013-01-04 07:49:07 +0000
+++ plugins/opengl/include/opengl/opengl.h	2013-01-09 10:50:25 +0000
@@ -50,7 +50,7 @@
 #include <opengl/programcache.h>
 #include <opengl/shadercache.h>
 
-#define COMPIZ_OPENGL_ABI 6
+#define COMPIZ_OPENGL_ABI 7
 
 /*
  * Some plugins check for #ifdef USE_MODERN_COMPIZ_GL. Support it for now, but

=== modified file 'plugins/opengl/include/opengl/shadercache.h'
--- plugins/opengl/include/opengl/shadercache.h	2012-05-17 10:41:21 +0000
+++ plugins/opengl/include/opengl/shadercache.h	2013-01-09 10:50:25 +0000
@@ -83,6 +83,7 @@
 {
 public:
     GLShaderCache ();
+    ~GLShaderCache ();
 
     /**
      * Gets the GLShaderData associated with the specified parameters.

=== modified file 'plugins/opengl/src/shadercache.cpp'
--- plugins/opengl/src/shadercache.cpp	2012-05-17 10:41:21 +0000
+++ plugins/opengl/src/shadercache.cpp	2013-01-09 10:50:25 +0000
@@ -100,6 +100,11 @@
 {
 }
 
+GLShaderCache::~GLShaderCache ()
+{
+    delete priv;
+}
+
 const GLShaderData &
 GLShaderCache::getShaderData (const GLShaderParameters &params)
 {