Merge lp://qastaging/~kdub/mir/fix-1577967 into lp://qastaging/mir
Proposed by
Kevin DuBois
Status: | Merged |
---|---|
Approved by: | Kevin DuBois |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3533 |
Proposed branch: | lp://qastaging/~kdub/mir/fix-1577967 |
Merge into: | lp://qastaging/mir |
Diff against target: |
349 lines (+137/-48) 7 files modified
include/client/mir_toolkit/mir_surface.h (+17/-5) playground/mir_demo_client_prerendered_frames.c (+6/-0) src/client/mir_connection.cpp (+21/-25) src/client/mir_surface.cpp (+17/-16) src/client/mir_surface.h (+7/-2) tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+45/-0) tests/unit-tests/client/test_client_mir_surface.cpp (+24/-0) |
To merge this branch: | bzr merge lp://qastaging/~kdub/mir/fix-1577967 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Daniel van Vugt | Abstain | ||
Cemil Azizoglu (community) | Approve | ||
Alan Griffiths | Approve | ||
Chris Halse Rogers | Approve | ||
Review via email:
|
Commit message
fix lp: #1577967 by clarifying what mir_surface_
Description of the change
fix lp: #1577967 by clarifying what mir_surface_
note: the original thought was designate the 1st MirBufferStream as 'the default stream', however, soon it will be possible to have multiple MirPresentation
To post a comment you must log in.
FAILED: Continuous integration, rev:3505 /mir-jenkins. ubuntu. com/job/ mir-ci/ 967/ /mir-jenkins. ubuntu. com/job/ build-mir/ 1041/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/1088 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1079 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 1079 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1051/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 1051/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1051 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1051/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1051 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1051/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 1051/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
ABORTED: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 967/rebuild
https:/