Compiz

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

  1. compiz.fix_1189369
  2. Merge into 0.9.10
Proposed by Sam Spilsbury
Status: Merged
Approved by: MC Return
Approved revision: 3738
Merged at revision: 3738
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1189369
Merge into: lp:compiz/0.9.10
Diff against target: 27 lines (+16/-0)
1 file modified
plugins/opengl/src/window.cpp (+16/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1189369
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Review via email: mp+168467@code.launchpad.net

This proposal supersedes a proposal from 2013-06-10.

Commit message

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

(LP: #1189369)

Description of the change

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

(LP: #1189369)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3738
http://jenkins.qa.ubuntu.com/job/compiz-ci/196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/9

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

review: Approve (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

LGTM AFAICT ;)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/opengl/src/window.cpp'
2--- plugins/opengl/src/window.cpp 2013-01-03 16:05:26 +0000
3+++ plugins/opengl/src/window.cpp 2013-06-10 14:47:33 +0000
4@@ -179,8 +179,24 @@
5 }
6 else
7 {
8+ bool immediatelyUpdateMatricesAndRegions =
9+ priv->textures.size () != textures.size ();
10+
11 priv->textures = textures;
12 priv->needsRebind = false;
13+
14+ /* If the number of textures changed, we should immediately
15+ * update the matrices and regions so that they are at least
16+ * initialized, but we'll queue another update just before
17+ * glPaint too in case the window moved or changed size */
18+ if (immediatelyUpdateMatricesAndRegions)
19+ {
20+ priv->setWindowMatrix ();
21+ priv->updateWindowRegions ();
22+
23+ priv->updateState |= PrivateGLWindow::UpdateMatrix |
24+ PrivateGLWindow::UpdateRegion;
25+ }
26 }
27 }
28

Subscribers

People subscribed via source and target branches

to all changes: