Merge into 0.9.11 : compiz.merge-opengl-cleanup : Code : Compiz

Status:

Work in progress

Proposed branch:

lp://staging/~mc-return/compiz/compiz.merge-opengl-cleanup

Merge into:

lp://staging/compiz/0.9.11

Diff against target:

6177 lines (+1581/-1449)

26 files modified

plugins/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)

To merge this branch:

bzr merge lp://staging/~mc-return/compiz/compiz.merge-opengl-cleanup

Related bugs:

Bug #1101408: Coverity UNINIT_CTOR - CID 12578 - plugins/opengl/src/screen.cpp - in function: PrivateGLScreen::PrivateGLScreen(GLScreen *) - Multiple non-static class member fields and class members not initialized in this constructor nor in any functions that it calls.	Medium	In Progress
Bug #1101410: Coverity UNINIT_CTOR - CID 12577 - plugins/opengl/src/framebufferobject.cpp - in function: PrivateGLFramebufferObject::PrivateGLFramebufferObject() - Non-static class member "rbStencilId" is not initialized in this constructor nor in any functions that it calls.	Medium	In Progress
Bug #1101493: Coverity UNINIT_CTOR - CID 12580 - plugins/opengl/src/vertexbuffer.cpp - in function: PrivateVertexBuffer::PrivateVertexBuffer() - Non-static class members "color", "primitiveType" and "usage" are not initialized in this constructor nor in any functions that it calls.	Medium	In Progress
Bug #1101594: Coverity UNINIT_CTOR - CID 12579 - plugins/opengl/src/texture.cpp - in function: TfpTexture::TfpTexture() - Non-static class members "x11Pixmap" and "source" are not initialized in this constructor nor in any functions that it calls.	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Compiz Maintainers		2013-07-24	Pending
Review via email: mp+176724@code.staging.launchpad.net

Commit message

*OpenGL plugin, cleanup:

Bail out of functions ASAP, do not calculate stuff you might not need.
Merged if condition checks.
Use pre- instead of postfix de- and increments.
Declare variables outside of loops.
Declarations and assignment of local variables in one line.
Removed redundant brackets.
Removed and added newlines for better readability.
Fixed indentation.
Fixed a few typos in comments and debug-messages.
Added TODO comment.

*OpenGL plugin, fixes:

framebufferobject.cpp:
Also initialize the non-static struct member "rbStencilId" in the
PrivateGLFramebufferObject::PrivateGLFramebufferObject () constructor
(LP: #1101410)

screen.cpp:
Initialize all the non-static class member fields (glxPixmapFBConfigs,
lastViewport) and members (filter, saveWindow) in the PrivateGLScreen::
PrivateGLScreen (GLScreen *) constructor.
(LP: #1101408)

texture.cpp:
Also initialize the non-static class members "x11Pixmap" and "source" in
the TfpTexture::TfpTexture () ctor.
(LP: #1101594)

vertexbuffer.cpp:
Also initialize the non-static class members "color", "primitiveType" and
"usage" in the PrivateVertexBuffer::PrivateVertexBuffer () constructor
(LP: #1101493)

Unmerged revisions

3688. By MC Return on 2013-07-21

Merged latest lp:compiz

3687. By MC Return on 2013-07-07

Merged latest lp:compiz and fixed conflict in plugins/opengl/src/paint.cpp

3686. By MC Return on 2013-07-07

framebufferobject.cpp:
Also initialize the non-static struct member "rbStencilId" in the
PrivateGLFramebufferObject::PrivateGLFramebufferObject () constructor
(LP: #1101410)

Removed alignment in the ctor

3685. By MC Return on 2013-07-07

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 on 2013-07-07

Also initialize the non-static class members "color", "primitiveType" and
"usage" in the PrivateVertexBuffer::PrivateVertexBuffer () constructor
(LP: #1101493)

3683. By MC Return on 2013-07-07

texture.cpp:
Also initialize the non-static class members "x11Pixmap" and "source" in
the TfpTexture::TfpTexture () ctor (LP: #1101594)

3682. By MC Return on 2013-06-28

Indentation fixes
Re-added "lost" code in paint.cpp

3681. By MC Return on 2013-06-28

Removed bracket (typo)

3680. By MC Return on 2013-06-28

Merged latest lp:compiz and fixed conflict in plugins/opengl/src/window.cpp

3679. By MC Return on 2013-06-28

Added missing " | NoOcclusionDetection"

Compiz

Merge lp://staging/~mc-return/compiz/compiz.merge-opengl-cleanup into lp://staging/compiz/0.9.11

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers