lp://staging/~kdub/mir/no-abi-break-mm

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/mir

Mir development team: Pending requested 2015-02-17

Diff: 646 lines (+311/-45)

18 files modified

src/platforms/android/server/display.cpp (+5/-2)
src/platforms/android/server/display_device.h (+4/-0)
src/platforms/android/server/fb_device.cpp (+8/-0)
src/platforms/android/server/fb_device.h (+2/-0)
src/platforms/android/server/hwc_blanking_control.cpp (+13/-2)
src/platforms/android/server/hwc_device.cpp (+107/-32)
src/platforms/android/server/hwc_device.h (+23/-0)
src/platforms/android/server/hwc_fb_device.cpp (+8/-0)
src/platforms/android/server/hwc_fb_device.h (+2/-0)
src/platforms/android/server/swapping_gl_context.h (+2/-0)
tests/include/mir_test_doubles/mock_display_device.h (+2/-0)
tests/include/mir_test_doubles/mock_swapping_gl_context.h (+2/-0)
tests/include/mir_test_doubles/stub_display_builder.h (+14/-3)
tests/include/mir_test_doubles/stub_swapping_gl_context.h (+2/-0)
tests/unit-tests/graphics/android/hwc_struct_helpers.h (+18/-5)
tests/unit-tests/graphics/android/test_display.cpp (+40/-1)
tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+15/-0)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+44/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2325. By Kevin DuBois on 2015-02-17

merge signal

2324. By Kevin DuBois on 2015-02-17

merge bad sync branch

2323. By Daniel van Vugt on 2015-02-17

Fix the multi-monitor frame sync logic to support high speed
compositors (tm) which only need to hold buffers very briefly
(introduced in r2183). (LP: #1420678)

Both the multi-monitor frame sync logic and the optimization of r2183
behave correctly independently. It's only when combined that they start
to interfere with each other. But we'd very much like to keep both. Fixes: https://bugs.launchpad.net/bugs/1420678.

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

2322. By Alexandros Frantzis on 2015-02-16

doc: Add documentation about running Mir in VMware.

Approved by Andreas Pokorny, PS Jenkins bot, Alan Griffiths.

2321. By Alan Griffiths on 2015-02-16

examples: Add support for closing surfaces and sessions to TilingWindowManagerPolicy.

Approved by Alexandros Frantzis, PS Jenkins bot.

2320. By Andreas Pokorny on 2015-02-16

Fix corrupt AMD/radeon cursor again (LP: #1417581)

Include the omitted parts back into the bugfix

Back then when the cursor issue of radeons and kaveris was handled I omitted this check to simplify the fix. This part was necessary to make GBM return correct stride sizes. GBM seems to stick to the size provided on construction, and does not verify what buffer was returned by the driver. Yes this is broken in GBM, but we are currently not alone with this workaround. Fixes: https://bugs.launchpad.net/bugs/1391975, https://bugs.launchpad.net/bugs/1417581.

Approved by Gerry Boland, PS Jenkins bot, Daniel van Vugt, Alexandros Frantzis.

2319. By Alan Griffiths on 2015-02-13

examples: split out the TilingWindowManagerPolicy example code.

Approved by PS Jenkins bot, Alexandros Frantzis.

2318. By Alan Griffiths on 2015-02-13

examples: An example framework for window management.

Approved by Chris Halse Rogers, PS Jenkins bot, Alberto Aguirre, Kevin DuBois.

2317. By Robert Carr on 2015-02-12

Port most unit tests to MirEvent 2.0 (some will have to wait until the final mp).

Approved by Kevin DuBois, Alan Griffiths, PS Jenkins bot.

2316. By Chris Halse Rogers on 2015-02-12

Drop mirserver dependency on server-platform drivers.

An equivalent change for the server as for the clients in r2295, with equivalent justification.
.

Approved by Alan Griffiths, PS Jenkins bot, Ricardo Salveti.