Merge lp://staging/~raof/qtmir/multi-bufferstream-support into lp://staging/qtmir
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~raof/qtmir/multi-bufferstream-support |
Merge into: | lp://staging/qtmir |
Diff against target: |
639 lines (+163/-241) 7 files modified
src/modules/Unity/Application/CMakeLists.txt (+1/-0) src/modules/Unity/Application/mirsurface.cpp (+144/-63) src/modules/Unity/Application/mirsurface.h (+5/-13) src/modules/Unity/Application/mirsurfaceinterface.h (+6/-7) src/modules/Unity/Application/mirsurfaceitem.cpp (+1/-134) src/modules/Unity/Application/mirsurfaceitem.h (+0/-17) tests/modules/common/fake_mirsurface.h (+6/-7) |
To merge this branch: | bzr merge lp://staging/~raof/qtmir/multi-bufferstream-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Gerry Boland (community) | Needs Fixing | ||
Review via email: mp+274517@code.staging.launchpad.net |
Commit message
MirSurface/
Since multi-BufferStream surfaces are trivial scenegraphs themselves, implement this
as QSGNode *MirSurface:
Rather than having the MirSurfaceItem be a textureProvider, use updatePaintNode to
refresh the surface sub-graph.
In turn, store the MirBufferSGTexture in a new QSGMirRenderabl
resources and updates them. This frees us from the manual resource management;
everything is owned by the QSGNode, and Qt will clean everything up appropriately.
Description of the change
MirSurface/
Since multi-BufferStream surfaces are trivial scenegraphs themselves, implement this
as QSGNode *MirSurface:
Rather than having the MirSurfaceItem be a textureProvider, use updatePaintNode to
refresh the surface sub-graph.
In turn, store the MirBufferSGTexture in a new QSGMirRenderabl
resources and updates them. This frees us from the manual resource management;
everything is owned by the QSGNode, and Qt will clean everything up appropriately.
Unmerged revisions
- 389. By Chris Halse Rogers
-
Re-add empty buffer check that got mysteriously dropped
- 388. By Chris Halse Rogers
-
Merge fixes from Loïc
- 387. By Chris Halse Rogers
-
MirSurface/
MirSurfaceItem: Implement multi-BufferStream surfaces. Since multi-BufferStream surfaces are trivial scenegraphs themselves, implement this
as QSGNode *MirSurface::updateSubgraph (QSGNode* ). Rather than having the MirSurfaceItem be a textureProvider, use updatePaintNode to
refresh the surface sub-graph.In turn, store the MirBufferSGTexture in a new QSGMirRenderabl
eNode which owns the
resources and updates them. This frees us from the manual resource management;
everything is owned by the QSGNode, and Qt will clean everything up appropriately.
PASSED: Continuous integration, rev:387 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 520/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 216 jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 216 jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 216/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ qtmir-vivid- i386-ci/ 98 jenkins. qa.ubuntu. com/job/ qtmir-wily- amd64-ci/ 253 jenkins. qa.ubuntu. com/job/ qtmir-wily- armhf-ci/ 253 jenkins. qa.ubuntu. com/job/ qtmir-wily- armhf-ci/ 253/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ qtmir-wily- i386-ci/ 98
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/520/ rebuild
http://