Mir

Merge lp://qastaging/~kdub/mir/refix-1517205 into lp://qastaging/mir

refix-1517205
Merge into development-branch

Proposed by Kevin DuBois on 2016-01-25

Status:

Merged

Approved by:

Daniel van Vugt on 2016-02-09

Approved revision:

no longer in the source branch.

Merged at revision:

3297

Proposed branch:

lp://qastaging/~kdub/mir/refix-1517205

Merge into:

lp://qastaging/mir

Diff against target:

2060 lines (+730/-149)

71 files modified

include/renderers/gl/mir/renderer/gl/texture_source.h (+10/-0)
src/gl/recently_used_cache.cpp (+8/-7)
src/include/platform/mir/graphics/egl_extensions.h (+0/-8)
src/platform/graphics/CMakeLists.txt (+0/-1)
src/platform/graphics/egl_extensions.cpp (+0/-12)
src/platforms/android/client/CMakeLists.txt (+1/-0)
src/platforms/android/client/gralloc_registrar.cpp (+4/-2)
src/platforms/android/common/CMakeLists.txt (+2/-0)
src/platforms/android/common/android_native_buffer.cpp (+18/-4)
src/platforms/android/common/egl_sync_extensions.cpp (+35/-0)
src/platforms/android/common/egl_sync_fence.cpp (+1/-1)
src/platforms/android/include/android/native_window.h (+21/-0)
src/platforms/android/include/android_native_buffer.h (+6/-0)
src/platforms/android/include/command_stream_sync.h (+51/-0)
src/platforms/android/include/egl_sync_extensions.h (+48/-0)
src/platforms/android/include/egl_sync_fence.h (+2/-21)
src/platforms/android/include/native_buffer.h (+3/-0)
src/platforms/android/server/CMakeLists.txt (+1/-0)
src/platforms/android/server/android_alloc_adaptor.cpp (+12/-5)
src/platforms/android/server/android_alloc_adaptor.h (+6/-2)
src/platforms/android/server/android_buffer_allocator.cpp (+10/-4)
src/platforms/android/server/android_graphic_buffer_allocator.h (+5/-1)
src/platforms/android/server/buffer.cpp (+23/-4)
src/platforms/android/server/buffer.h (+6/-0)
src/platforms/android/server/cmdstream_sync_factory.h (+48/-0)
src/platforms/android/server/device_quirks.cpp (+6/-0)
src/platforms/android/server/device_quirks.h (+1/-0)
src/platforms/android/server/display_buffer.cpp (+3/-0)
src/platforms/android/server/display_component_factory.h (+2/-0)
src/platforms/android/server/display_device.h (+2/-0)
src/platforms/android/server/egl_sync_factory.cpp (+35/-0)
src/platforms/android/server/fb_device.cpp (+5/-2)
src/platforms/android/server/fb_device.h (+1/-0)
src/platforms/android/server/hal_component_factory.cpp (+20/-1)
src/platforms/android/server/hal_component_factory.h (+4/-1)
src/platforms/android/server/hwc_device.cpp (+11/-6)
src/platforms/android/server/hwc_device.h (+1/-0)
src/platforms/android/server/hwc_fb_device.cpp (+5/-0)
src/platforms/android/server/hwc_fb_device.h (+1/-0)
src/platforms/android/server/ipc_operations.cpp (+1/-0)
src/platforms/android/server/platform.cpp (+10/-4)
src/platforms/android/server/platform.h (+3/-0)
src/platforms/mesa/server/common/gbm_buffer.cpp (+9/-0)
src/platforms/mesa/server/common/gbm_buffer.h (+2/-0)
src/platforms/mesa/server/common/shm_buffer.cpp (+9/-0)
src/platforms/mesa/server/common/shm_buffer.h (+2/-0)
tests/include/mir/test/doubles/mock_android_native_buffer.h (+2/-0)
tests/include/mir/test/doubles/mock_buffer.h (+1/-0)
tests/include/mir/test/doubles/mock_display_device.h (+3/-0)
tests/include/mir/test/doubles/mock_gl_buffer.h (+2/-0)
tests/include/mir/test/doubles/stub_android_native_buffer.h (+3/-0)
tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h (+41/-0)
tests/include/mir/test/doubles/stub_display_builder.h (+5/-0)
tests/include/mir/test/doubles/stub_gl_buffer.h (+2/-0)
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+3/-0)
tests/unit-tests/gl/test_gl_texture_cache.cpp (+3/-1)
tests/unit-tests/gl/test_program_factory.cpp (+1/-1)
tests/unit-tests/graphics/android/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+6/-3)
tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+6/-2)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+13/-1)
tests/unit-tests/graphics/android/test_display_buffer.cpp (+15/-0)
tests/unit-tests/graphics/android/test_display_hotplug.cpp (+5/-0)
tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp (+75/-0)
tests/unit-tests/graphics/android/test_fb_device.cpp (+8/-0)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+9/-8)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+6/-0)
tests/unit-tests/graphics/android/test_native_buffer.cpp (+50/-7)
tests/unit-tests/graphics/android/test_platform.cpp (+15/-4)
tests/unit-tests/graphics/test_egl_extensions.cpp (+0/-35)
tests/unit-tests/graphics/test_egl_sync_fence.cpp (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~kdub/mir/refix-1517205

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-08
Alexandros Frantzis (community)		2016-01-25	Approve on 2016-02-08
Mir CI Bot	continuous-integration		Approve on 2016-02-08
Alan Griffiths			Approve on 2016-02-08
Review via email: mp+283861@code.qastaging.launchpad.net

Commit message

repropose already landed branch introducing sync fences
(https://code.launchpad.net/~kdub/mir/egl-sync-fences/+merge/278181)
while avoiding the mx4/powervr regression that caused its reversion.

fixes: LP: #1517205

Description of the change

repropose already landed branch introducing sync fences
(https://code.launchpad.net/~kdub/mir/egl-sync-fences/+merge/278181)
while avoiding the mx4/powervr regression that caused its reversion.

fixes: LP: #1517205

Tested against regression with MX4 with full unity stack.
The fixme in line 532 has a trello card to track: https://trello.com/c/XzFGfwlE

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3273
https://mir-jenkins.ubuntu.com/job/mir-ci/161/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/160/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/161/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3273
http://jenkins.qa.ubuntu.com/job/mir-ci/6129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5696/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4603
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5649/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6129/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3274
https://mir-jenkins.ubuntu.com/job/mir-ci/162/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/162/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/162/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6130/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3276
https://mir-jenkins.ubuntu.com/job/mir-ci/164/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/164/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/164/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6133/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-01-27:

failure was intermittent, nonrelated lp: #1537798

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-27:

FAILED: Continuous integration, rev:3277
https://mir-jenkins.ubuntu.com/job/mir-ci/169/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/169/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/169/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2016-01-27:

=> class TextureSource

The changes break TextureSource ABI, which is used by QtMir and others. We haven't really thought through all the details about how we handle such a case, but I guess we should at least ensure the ABI numbers of the platforms supporting GL (i.e. everything at the moment) are bumped.

+ mirplatform

mirplatform was used up to now for the server side of Mir. Do we want to use the same library for the client?

Looks discussion/fixing

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6139/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6142/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-01-28:

> + mirplatform
>
> mirplatform was used up to now for the server side of Mir. Do we want to use
> the same library for the client?
>
> Looks discussion/fixing

IMO "mirplatform" is the wrong place for anything mirclient uses. Maybe the name is misleading, but it was intended to provide the types needed to specify the mirserver requirements on a platform module.

Types needed by both server and client should be in mircommon. (I am aware there are some currently in mirclient - because of some coupling in the implementation that no-one has spent time unpicking.)

[aside] With our thoughts about removing reliance on EGL, perhaps we need a new miregl library that client and server "platform" modules could use?

review: Needs Information

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-01-28:

I'm wasn't too flummoxed by mirplatform being used by the client, but OTOH, may as well not link to it if we can help it.

I sidestepped the problem by pulling the new code from mirplatform to src/platforms/android/common. (a directory for common-to-client-and-server android code).

I also bumped server ABI for the 0.20 series, as we have indeed broken the server abi (but not api) for those using mg::Buffer's

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
https://mir-jenkins.ubuntu.com/job/mir-ci/180/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/180/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/180/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6151/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5722/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4629/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5678/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5675/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6151/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6154/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5725/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5681/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5678/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6154/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6155/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5726/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4633/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5682/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5679/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6155/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-01-29:

PASSED: Continuous integration, rev:3281
https://mir-jenkins.ubuntu.com/job/mir-ci/188/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/189/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/188/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-29:

FAILED: Continuous integration, rev:3281
http://jenkins.qa.ubuntu.com/job/mir-ci/6161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5739/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4646
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5695/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/485/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5692/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6161/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-02-02:

PASSED: Continuous integration, rev:3283
https://mir-jenkins.ubuntu.com/job/mir-ci/210/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/210/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/210/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6188/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-02-03:

I'm not sure what's going on with the move of mir::graphics::Foo headers to src/platforms/android/include/

Are these types specific to android platforms? If so, do they belong in namespace mir::graphics?

review: Needs Information

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-02-05:

They are only used by the android platform at the moment (so that mirplatform remains server-side only), but they are not android-specific, so graphics seems appropriate.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-02-08:

*Note to reviewers:* the lp diff is wrong (stale?)

Otherwise seems OK

review: Approve

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2016-02-08:

We also need to update the ABI of all our platforms (since they support TextureSource).

review: Needs Fixing

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-02-08: