Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.performance_1040478 into lp://qastaging/compiz/0.9.8

compiz.performance_1040478
Merge into 0.9.8

Proposed by Sam Spilsbury on 2012-09-28

Status:

Superseded

Proposed branch:

lp://qastaging/~compiz-team/compiz/compiz.performance_1040478

Merge into:

lp://qastaging/compiz/0.9.8

Diff against target:

1931 lines (+1212/-268) (has conflicts)

15 files modified

plugins/opengl/CMakeLists.txt (+13/-0)
plugins/opengl/include/opengl/framebufferobject.h (+219/-73)
plugins/opengl/include/opengl/opengl-api.h (+42/-0)
plugins/opengl/include/opengl/opengl.h (+49/-21)
plugins/opengl/src/fbdirectdraw/CMakeLists.txt (+32/-0)
plugins/opengl/src/fbdirectdraw/include/framebuffer-direct-draw.h (+103/-0)
plugins/opengl/src/fbdirectdraw/src/framebuffer-direct-draw.cpp (+159/-0)
plugins/opengl/src/fbdirectdraw/tests/CMakeLists.txt (+24/-0)
plugins/opengl/src/fbdirectdraw/tests/test-opengl-framebuffer-direct-draw.cpp (+219/-0)
plugins/opengl/src/framebufferobject.cpp (+119/-60)
plugins/opengl/src/paint.cpp (+8/-82)
plugins/opengl/src/privates.h (+37/-6)
plugins/opengl/src/screen.cpp (+182/-20)
plugins/water/src/water.cpp (+3/-3)
plugins/water/src/water.h (+3/-3)

Text conflict in plugins/opengl/CMakeLists.txt
Text conflict in plugins/opengl/src/screen.cpp

To merge this branch:

bzr merge lp://qastaging/~compiz-team/compiz/compiz.performance_1040478

Wishlist

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2012-09-28	Pending
jenkins	continuous-integration	2012-09-28	Pending
Review via email: mp+126874@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-28.

This proposal has been superseded by a proposal from 2012-09-28.

Description of the change

Proposing this now so I can get some early feedback.

Implement support for glBlitFramebuffer. On some platforms this may speed up the final composite operation as we skip the fragment processor entirely.

The logic around this code is basically that if glBlitFramebuffer fails, then we don't use it again (the failure case is it not being available), and use the fallback textured draw code.

Tests added for the new module FramebufferDirectDraw.

The API and ABI of GLFramebufferObject were broken too so that we could specify which buffer we actually wanted to bind. Distro says they're okay with this.

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-09-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3387
http://jenkins.qa.ubuntu.com/job/compiz-ci/77/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/77/console

review: Needs Fixing (continuous-integration)

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-09-15: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3388
http://jenkins.qa.ubuntu.com/job/compiz-ci/78/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/78/console

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-09-20: Posted in a previous version of this proposal

I have not seen any improvement yet myself. It would have to be quite significant to risk large changes to the 0.9.8 tree right now.

As far as I can tell, this is not required for quantal. So please repropose it after we've branched for 0.9.9.

review: Needs Resubmitting

lp://qastaging/~compiz-team/compiz/compiz.performance_1040478 updated on 2013-02-28

3389. By Sam Spilsbury on 2012-10-02: Merge lp:compiz
3390. By Sam Spilsbury on 2012-12-07: Merge e lp:compiz
3391. By Sam Spilsbury on 2012-12-07: Merge lp:compiz
3392. By Sam Spilsbury on 2012-12-07: Simplify lots of variable names, unindent namespaces
3393. By Sam Spilsbury on 2012-12-07: Set the stencil and depth attachments in allocate and not bind
3394. By Sam Spilsbury on 2012-12-07: Refactored large parts of the code, make binding the concern of BindLocation
3395. By Sam Spilsbury on 2012-12-13: Merge lp:compiz
3396. By Sam Spilsbury on 2012-12-21: Moved the creation of directly drawable fbo's into a convenience method
so that other plugins can create them
3397. By Sam Spilsbury on 2012-12-21: Fix compile error on tests
3398. By Sam Spilsbury on 2012-12-22: We don't need to provide a BindableFramebuffer to access the backbuffer
3399. By Sam Spilsbury on 2012-12-22: Unbind framebuffers before processing output change
3400. By Sam Spilsbury on 2012-12-22: Invert y-coords of glBlitFramebuffer operation
3401. By Sam Spilsbury on 2012-12-23: Reset framebuffer status on reallocation
3402. By Sam Spilsbury on 2013-01-03: Merge lp:compiz
3403. By Sam Spilsbury on 2013-01-04: Remove unused variable
3404. By Sam Spilsbury on 2013-01-30: Merge lp:compiz
3405. By Sam Spilsbury on 2013-02-10: Merge lp:compiz
3406. By Sam Spilsbury on 2013-02-12: Merge lp:compiz
3407. By Sam Spilsbury on 2013-02-12: Remove referenes to configure buffers
3408. By Sam Spilsbury on 2013-02-12: Revert trunk merge as it was broken
3409. By Sam Spilsbury on 2013-02-12: Merge lp:compiz
3410. By Sam Spilsbury on 2013-02-12: Unrevert changes which shouldn't have been reverted
3411. By Sam Spilsbury on 2013-02-12: Another botched merge
3412. By Sam Spilsbury on 2013-02-13: Merge lp:compiz
3413. By Sam Spilsbury on 2013-02-13: Fix merge errors
3414. By Sam Spilsbury on 2013-02-15: Merge lp:compiz
3415. By Sam Spilsbury on 2013-02-18: Revert more changes which should not have happened
3416. By Sam Spilsbury on 2013-02-18: Make the currently bound drawbuffer available to plugins (as they might want
to do a read/draw swap)
3417. By Sam Spilsbury on 2013-02-25: Merge lp:compiz
3418. By Sam Spilsbury on 2013-02-27: Merge lp:compiz
3419. By Sam Spilsbury on 2013-02-28: Unrevert changes reverted by a merge

Unmerged revisions

3419. By Sam Spilsbury on 2013-02-28: Unrevert changes reverted by a merge
3418. By Sam Spilsbury on 2013-02-27: Merge lp:compiz
3417. By Sam Spilsbury on 2013-02-25: Merge lp:compiz
3416. By Sam Spilsbury on 2013-02-18: Make the currently bound drawbuffer available to plugins (as they might want
to do a read/draw swap)
3415. By Sam Spilsbury on 2013-02-18: Revert more changes which should not have happened
3414. By Sam Spilsbury on 2013-02-15: Merge lp:compiz
3413. By Sam Spilsbury on 2013-02-13: Fix merge errors
3412. By Sam Spilsbury on 2013-02-13: Merge lp:compiz
3411. By Sam Spilsbury on 2013-02-12: Another botched merge
3410. By Sam Spilsbury on 2013-02-12: Unrevert changes which shouldn't have been reverted