← Back to branch summary

~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/opengl/src/window.cpp

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/opengl/src/window.cpp
179
179
        }
180
180
        else
181
181
        {
 
182
            bool immediatelyUpdateMatricesAndRegions =
 
183
                priv->textures.size () != textures.size ();
 
184
 
182
185
            priv->textures = textures;
183
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
    }
186
202