lp:~raof/qtmir/multi-bufferstream-support
- Get this branch:
- bzr branch lp:~raof/qtmir/multi-bufferstream-support
Branch merges
- PS Jenkins bot (community): Needs Fixing (continuous-integration)
- Gerry Boland (community): Needs Fixing
-
Diff: 639 lines (+163/-241)7 files modifiedsrc/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)
Branch information
Recent revisions
- 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. - 383. By Gerry Boland
-
Add "Closing" state to Application, use it to distinguish user-induced close from app-induced close. Don't clear QML cache if user-induced.
Much code taken from a partially-related branch by Nick Dedekind:
https://code.launchpad .net/~nick- dedekind/ qtmir/polite- close/+ merge/262188 Note there is 1 disabled test, which needs additional work to fix. Fixes: #1500372
Approved by: PS Jenkins bot - 382. By Daniel d'Andrada
-
MirSurfaceItem: texture must be manipulated only from the scene graph thread
Do not delete the texture from within the GUI thread ever, even if the
MirSurfaceItem is no longer holding the MirSurface that provided it.
Otherwise you run the risk of having the scene graph thread dereferencing
a pointer to a texture that no longer exists.This also fixes fd leak LP: #1495871 (which was a texture/buffer leak). Fixes: #1495871, #1499388
Approved by: Gerry Boland, PS Jenkins bot
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:qtmir