Merge lp://qastaging/~compiz-team/compiz/compiz.performance_1040478 into lp://qastaging/compiz/0.9.8
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Pending | ||
jenkins | continuous-integration | 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 FramebufferDire
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.
Unmerged revisions
- 3419. By Sam Spilsbury
-
Unrevert changes reverted by a merge
- 3418. By Sam Spilsbury
-
Merge lp:compiz
- 3417. By Sam Spilsbury
-
Merge lp:compiz
- 3416. By Sam Spilsbury
-
Make the currently bound drawbuffer available to plugins (as they might want
to do a read/draw swap) - 3415. By Sam Spilsbury
-
Revert more changes which should not have happened
- 3414. By Sam Spilsbury
-
Merge lp:compiz
- 3413. By Sam Spilsbury
-
Fix merge errors
- 3412. By Sam Spilsbury
-
Merge lp:compiz
- 3411. By Sam Spilsbury
-
Another botched merge
- 3410. By Sam Spilsbury
-
Unrevert changes which shouldn't have been reverted
FAILED: Continuous integration, rev:3387 jenkins. qa.ubuntu. com/job/ compiz- ci/77/ jenkins. qa.ubuntu. com/job/ compiz- ci/./build= pbuilder, distribution= quantal, flavor= amd64/77/ console
http://
Executed test runs:
FAILURE: http://