lp://qastaging/~albaguirre/mir/silo-virtual-output

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/mir/ubuntu

Daniel van Vugt: Disapprove on 2016-02-04

PS Jenkins bot (community): Approve (continuous-integration) on 2016-02-03

Diff: 3018 lines (+1119/-388)

70 files modified

CMakeLists.txt (+11/-1)
cmake/FindLibHardware.cmake (+1/-1)
cmake/MirCommon.cmake (+10/-12)
debian/changelog (+92/-42)
debian/control (+8/-8)
debian/libmirserver38.install (+1/-1)
debian/mir-platform-graphics-android8.install (+1/-1)
debian/mir-platform-graphics-mesa-kms8.install (+1/-1)
debian/mir-platform-graphics-mesa-x8.install (+1/-1)
examples/eglapp.c (+5/-1)
include/platform/mir/graphics/display.h (+7/-0)
include/platform/mir/graphics/virtual_output.h (+61/-0)
include/test/mir/test/doubles/null_display.h (+5/-0)
src/client/probing_client_platform_factory.cpp (+24/-23)
src/common/logging/dumb_console_logger.cpp (+2/-2)
src/common/sharedlibrary/CMakeLists.txt (+1/-1)
src/common/sharedlibrary/shared_library_prober.cpp (+20/-5)
src/common/symbols.map (+7/-0)
src/include/common/mir/protobuf/protocol_version.h (+10/-12)
src/include/common/mir/shared_library_prober.h (+8/-0)
src/include/server/mir/input/input_region.h (+2/-0)
src/include/server/mir/scene/legacy_scene_change_notification.h (+8/-1)
src/platform/graphics/display_configuration.cpp (+1/-1)
src/platforms/CMakeLists.txt (+2/-2)
src/platforms/android/common/syncfence.cpp (+1/-1)
src/platforms/android/server/CMakeLists.txt (+1/-0)
src/platforms/android/server/display.cpp (+20/-2)
src/platforms/android/server/display.h (+1/-0)
src/platforms/android/server/display_configuration.cpp (+75/-2)
src/platforms/android/server/display_configuration.h (+11/-1)
src/platforms/android/server/virtual_output.cpp (+43/-0)
src/platforms/android/server/virtual_output.h (+50/-0)
src/platforms/mesa/server/kms/display.cpp (+6/-0)
src/platforms/mesa/server/kms/display.h (+1/-0)
src/platforms/mesa/server/x11/graphics/display.cpp (+6/-0)
src/platforms/mesa/server/x11/graphics/display.h (+1/-0)
src/server/CMakeLists.txt (+1/-1)
src/server/compositor/compositing_screencast.cpp (+35/-4)
src/server/compositor/multi_threaded_compositor.cpp (+106/-81)
src/server/compositor/multi_threaded_compositor.h (+2/-0)
src/server/frontend/socket_connection.cpp (+5/-7)
src/server/graphics/nested/display.cpp (+27/-2)
src/server/graphics/nested/display.h (+4/-0)
src/server/graphics/offscreen/display.cpp (+6/-0)
src/server/graphics/offscreen/display.h (+1/-0)
src/server/input/default_configuration.cpp (+1/-1)
src/server/input/default_input_manager.cpp (+12/-4)
src/server/input/display_input_region.cpp (+4/-27)
src/server/input/display_input_region.h (+8/-8)
src/server/scene/default_configuration.cpp (+2/-1)
src/server/scene/legacy_scene_change_notification.cpp (+62/-5)
src/server/scene/mediating_display_changer.cpp (+20/-2)
src/server/scene/mediating_display_changer.h (+9/-1)
src/server/symbols.map (+1/-1)
tests/acceptance-tests/test_client_library.cpp (+6/-7)
tests/acceptance-tests/test_nested_mir.cpp (+48/-48)
tests/acceptance-tests/throwback/test_client_cursor_api.cpp (+9/-4)
tests/include/mir/test/doubles/mock_display.h (+2/-0)
tests/include/mir/test/doubles/mock_input_region.h (+1/-0)
tests/integration-tests/input/test_single_seat_setup.cpp (+1/-0)
tests/integration-tests/test_surface_stack_with_compositor.cpp (+1/-1)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+4/-0)
tests/unit-tests/compositor/test_compositing_screencast.cpp (+90/-28)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+2/-11)
tests/unit-tests/graphics/android/test_display.cpp (+41/-5)
tests/unit-tests/graphics/nested/test_nested_display.cpp (+44/-0)
tests/unit-tests/graphics/test_display_configuration.cpp (+11/-0)
tests/unit-tests/input/test_default_input_device_hub.cpp (+1/-0)
tests/unit-tests/input/test_display_input_region.cpp (+8/-14)
tests/unit-tests/scene/test_mediating_display_changer.cpp (+39/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3292. By Alberto Aguirre on 2016-02-03

merge lp:mir/ubuntu

3291. By Alan Griffiths on 2016-02-03

tests: Add a small delay to ensure the TestClientCursorAPI.cursor_passed_through_nested_server test conditions are set up correctly. Fixes: https://bugs.launchpad.net/bugs/1525003.

Approved by Alexandros Frantzis, mir-ci-bot, Kevin DuBois, Alberto Aguirre, PS Jenkins bot.

3290. By Alberto Aguirre on 2016-02-03

Bump server/platforms ABI.

Approved by Alan Griffiths, Andreas Pokorny, PS Jenkins bot, Kevin DuBois, mir-ci-bot.

3289. By Daniel van Vugt on 2016-02-03

 Forward-port kgunn's changelog update (fixes a TODO for 0.19.0)
.

Approved by Kevin DuBois, Alan Griffiths, PS Jenkins bot, mir-ci-bot.

3288. By Andreas Pokorny on 2016-02-03

input: Copy output rectangles when configuration changes

DisplayInputRegion used to calculate a set of rectangles on every mouse event, even when the set of outputs rarely changes. This change keeps a mir::geometry::Rectangles as cache. The actual dead lock of lp:1538632 was caused by the fact that DisplauInputRegion would use - to calculate the mir::geometry::Rectangles - the following locks in the given order:
  * mir::graphics::Display::configuration_mutex via for_each_display_sync_group()
  * mir::graphics::DisplayGroup::guard via for_each_display_buffer()

Simultaneously the SystemWindowManager::add_display method is called by the CompositingFunctor, which uses DisplaySyncGroup::for_each_display_buffer, and deeper in the call tree GraphicsDisplayLayout would request a copy of the DisplayConfiguration during place_in_output, which results in the reverse lock ordering:
  * mir::graphics::DisplayGroup::guard via for_each_display_buffer()
  * mir::graphics::Display::configuration_mutex via configration()

This change makes sure that the DisplayInputRegion does not touch any locks used by the graphics platform during input event handling. Fixes: https://bugs.launchpad.net/bugs/1538632.

Approved by Kevin DuBois, Alan Griffiths, PS Jenkins bot, mir-ci-bot.

3287. By Alberto Aguirre on 2016-02-02

Fix make release-checks

The target should fail when symbols contain "unreleased" in their names.

Approved by PS Jenkins bot, mir-ci-bot, Alan Griffiths, Daniel van Vugt.

3286. By Alan Griffiths on 2016-02-02

common, client: a more flexible way to probe modules: once we've found a good current platform we don't even try to load an older one. (More cleanup related to cases of lp:1526658). Fixes: https://bugs.launchpad.net/bugs/1526658, https://bugs.launchpad.net/bugs/1527449.

Approved by PS Jenkins bot, Daniel van Vugt, Cemil Azizoglu, Alexandros Frantzis, Alberto Aguirre, mir-ci-bot.

3285. By Alberto Aguirre on 2016-02-02

Update version to 0.20 series.

Approved by Daniel van Vugt, PS Jenkins bot, mir-ci-bot.

3284. By Alberto Aguirre on 2016-02-01

Allow screencasting to create a virtual output.

When a given screencast region does not intersect with any of the current connected display output regions it creates a new virtual output.

A virtual output can coexist with physical display outputs.
When a virtual output is enabled, the same display configuration notifications are generated as with a physical display.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

3283. By Alberto Aguirre on 2016-02-01

nested-display: Use matching egl configs when creating any context (display, display buffer, shared gl context) (LP: #1539268)

Do not use arbitrary attributes when choosing an egl config for the context created during create_gl_context. Fixes: https://bugs.launchpad.net/bugs/1539268.

Approved by Alan Griffiths, Chris Halse Rogers, PS Jenkins bot, mir-ci-bot.