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

Proposed by Sam Spilsbury on 2013-06-10
Status: Merged
Approved by: MC Return on 2013-06-11
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 2013-06-10 Approve on 2013-06-11
MC Return 2013-06-10 Approve on 2013-06-10
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.
MC Return (mc-return) wrote :

LGTM AFAICT ;)

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 14:47:33 +0000
@@ -179,8 +179,24 @@
179 }179 }
180 else180 else
181 {181 {
182 bool immediatelyUpdateMatricesAndRegions =
183 priv->textures.size () != textures.size ();
184
182 priv->textures = textures;185 priv->textures = textures;
183 priv->needsRebind = false;186 priv->needsRebind = false;
187
188 /* If the number of textures changed, we should immediately
189 * update the matrices and regions so that they are at least
190 * initialized, but we'll queue another update just before
191 * glPaint too in case the window moved or changed size */
192 if (immediatelyUpdateMatricesAndRegions)
193 {
194 priv->setWindowMatrix ();
195 priv->updateWindowRegions ();
196
197 priv->updateState |= PrivateGLWindow::UpdateMatrix |
198 PrivateGLWindow::UpdateRegion;
199 }
184 }200 }
185 }201 }
186202

Subscribers

People subscribed via source and target branches

to all changes: