Merge lp:~compiz-team/compiz/compiz.fix_1189369 into lp:compiz/0.9.10

[Sam Spilsbury]

Immediately update the window matrices and regions if the number of
textures changed.

(LP: #1189369)

Immediately update the window matrices and regions if the number of
textures changed.

(LP: #1189369)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3738
http://jenkins.qa.ubuntu.com/job/compiz-ci/195/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/236/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'plugins/opengl/src/window.cpp'
--- plugins/opengl/src/window.cpp	2013-01-03 16:05:26 +0000
+++ plugins/opengl/src/window.cpp	2013-06-10 09:04:27 +0000
@@ -179,8 +179,24 @@
 	}
 	else
 	{
+	    bool immediatelyUpdateMatricesAndRegions =
+		priv->textures.size () != textures.size ();
+
 	    priv->textures = textures;
 	    priv->needsRebind = false;
+
+	    /* If the number of textures changed, we should immediately
+	     * update the matrices and regions so that they are at least
+	     * initialized, but we'll queue another update just before
+	     * glPaint too in case the window moved or changed size */
+	    if (immediatelyUpdateMatricesAndRegions)
+	    {
+		priv->setWindowMatrix ();
+		priv->updateWindowRegions ();
+
+		priv->updateState |= PrivateGLWindow::UpdateMatrix |
+				     PrivateGLWindow::UpdateRegion;
+	    }
 	}
     }