lp://staging/~mc-return/compiz/compiz.merge-opengl-cleanup
Created by
MC Return
and last modified
- Get this branch:
- bzr branch lp://staging/~mc-return/compiz/compiz.merge-opengl-cleanup
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp://staging/compiz/0.9.11
- Compiz Maintainers: Pending requested
-
Diff: 6177 lines (+1581/-1449)26 files modifiedplugins/opengl/include/opengl/doublebuffer.h (+14/-8)
plugins/opengl/include/opengl/opengl.h (+136/-133)
plugins/opengl/include/opengl/program.h (+38/-16)
plugins/opengl/include/opengl/programcache.h (+2/-1)
plugins/opengl/include/opengl/texture.h (+11/-5)
plugins/opengl/include/opengl/vector.h (+6/-2)
plugins/opengl/src/blacklist/blacklist.cpp (+8/-6)
plugins/opengl/src/blacklist/blacklist.h (+4/-2)
plugins/opengl/src/doublebuffer/src/double-buffer.cpp (+2/-4)
plugins/opengl/src/framebufferobject.cpp (+26/-21)
plugins/opengl/src/fsregion/fsregion.cpp (+9/-11)
plugins/opengl/src/fsregion/fsregion.h (+10/-4)
plugins/opengl/src/matrix.cpp (+24/-22)
plugins/opengl/src/opengl.cpp (+12/-10)
plugins/opengl/src/paint.cpp (+242/-260)
plugins/opengl/src/privates.h (+99/-85)
plugins/opengl/src/privatetexture.h (+17/-6)
plugins/opengl/src/privatevertexbuffer.h (+47/-39)
plugins/opengl/src/program.cpp (+46/-36)
plugins/opengl/src/programcache.cpp (+29/-34)
plugins/opengl/src/screen.cpp (+484/-453)
plugins/opengl/src/shadercache.cpp (+53/-47)
plugins/opengl/src/texture.cpp (+70/-61)
plugins/opengl/src/vector.cpp (+35/-33)
plugins/opengl/src/vertexbuffer.cpp (+108/-106)
plugins/opengl/src/window.cpp (+49/-44)
Related bugs
Related blueprints
Recent revisions
- 3686. By MC Return
-
framebufferobje
ct.cpp:
Also initialize the non-static struct member "rbStencilId" in the
PrivateGLFramebufferObject: :PrivateGLFrame bufferObject () constructor
(LP: #1101410)Removed alignment in the ctor
- 3685. By MC Return
-
screen.cpp:
Initialize all the non-static class member fields (glxPixmapFBConfigs,
lastViewport) and members (filter, saveWindow) in the PrivateGLScreen::
PrivateGLScreen (GLScreen *) constructor
(LP: #1101408)Reverted alignment in the constructor
- 3684. By MC Return
-
Also initialize the non-static class members "color", "primitiveType" and
"usage" in the PrivateVertexBuffer::PrivateVe rtexBuffer () constructor
(LP: #1101493)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/compiz/0.9.10