Mir

Merge lp://qastaging/~kdub/mir/revert-sync-factory into lp://qastaging/mir

  1. revert-sync-factory
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3194
Proposed branch: lp://qastaging/~kdub/mir/revert-sync-factory
Merge into: lp://qastaging/mir
Diff against target: 1599 lines (+64/-490)
57 files modified
include/renderers/gl/mir/renderer/gl/texture_source.h (+0/-10)
src/common/graphics/android/CMakeLists.txt (+0/-1)
src/common/graphics/android/android_native_buffer.cpp (+1/-15)
src/gl/recently_used_cache.cpp (+7/-8)
src/include/common/mir/graphics/android/android_native_buffer.h (+0/-6)
src/include/common/mir/graphics/android/native_buffer.h (+0/-3)
src/platform/symbols.map (+0/-14)
src/platforms/android/client/CMakeLists.txt (+0/-2)
src/platforms/android/client/gralloc_registrar.cpp (+1/-3)
src/platforms/android/server/CMakeLists.txt (+0/-1)
src/platforms/android/server/android_alloc_adaptor.cpp (+5/-12)
src/platforms/android/server/android_alloc_adaptor.h (+2/-6)
src/platforms/android/server/android_buffer_allocator.cpp (+4/-10)
src/platforms/android/server/android_graphic_buffer_allocator.h (+1/-5)
src/platforms/android/server/buffer.cpp (+4/-23)
src/platforms/android/server/buffer.h (+0/-6)
src/platforms/android/server/cmdstream_sync_factory.h (+0/-48)
src/platforms/android/server/display_buffer.cpp (+0/-3)
src/platforms/android/server/display_component_factory.h (+0/-2)
src/platforms/android/server/display_device.h (+0/-2)
src/platforms/android/server/egl_sync_factory.cpp (+0/-34)
src/platforms/android/server/fb_device.cpp (+2/-5)
src/platforms/android/server/fb_device.h (+0/-1)
src/platforms/android/server/hal_component_factory.cpp (+0/-15)
src/platforms/android/server/hal_component_factory.h (+1/-3)
src/platforms/android/server/hwc_device.cpp (+6/-11)
src/platforms/android/server/hwc_device.h (+0/-1)
src/platforms/android/server/hwc_fb_device.cpp (+0/-5)
src/platforms/android/server/hwc_fb_device.h (+0/-1)
src/platforms/android/server/ipc_operations.cpp (+0/-1)
src/platforms/android/server/platform.cpp (+4/-10)
src/platforms/android/server/platform.h (+0/-3)
src/platforms/mesa/server/common/gbm_buffer.cpp (+0/-9)
src/platforms/mesa/server/common/gbm_buffer.h (+0/-2)
src/platforms/mesa/server/common/shm_buffer.cpp (+0/-9)
src/platforms/mesa/server/common/shm_buffer.h (+0/-2)
tests/include/mir/test/doubles/mock_android_native_buffer.h (+0/-2)
tests/include/mir/test/doubles/mock_buffer.h (+0/-1)
tests/include/mir/test/doubles/mock_display_device.h (+0/-3)
tests/include/mir/test/doubles/mock_gl_buffer.h (+0/-2)
tests/include/mir/test/doubles/stub_android_native_buffer.h (+0/-3)
tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h (+0/-41)
tests/include/mir/test/doubles/stub_display_builder.h (+0/-5)
tests/include/mir/test/doubles/stub_gl_buffer.h (+0/-2)
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+0/-3)
tests/unit-tests/gl/test_gl_texture_cache.cpp (+1/-3)
tests/unit-tests/gl/test_program_factory.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+2/-5)
tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+2/-6)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+1/-13)
tests/unit-tests/graphics/android/test_display_buffer.cpp (+0/-15)
tests/unit-tests/graphics/android/test_display_hotplug.cpp (+0/-5)
tests/unit-tests/graphics/android/test_fb_device.cpp (+0/-8)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+8/-9)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+0/-6)
tests/unit-tests/graphics/android/test_native_buffer.cpp (+7/-50)
tests/unit-tests/graphics/android/test_platform.cpp (+4/-15)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/revert-sync-factory
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Cemil Azizoglu (community) Approve
Alan Griffiths Approve
Review via email: mp+280293@code.qastaging.launchpad.net

Commit message

revert adding support for the EGLSync extensions.

This code exposed a driver bug (LP: #1524414) where inserting an EGLSync point would mess up the depth testing during the GL render of PowerVR devices (mx4). Revert this fix until a palatable solution is found.

reverts LP: #1517205

Description of the change

revert adding support for the EGLSync extensions.

This code exposed a driver bug (LP: #1524414) where inserting an EGLSync point would mess up the depth testing during the GL render of PowerVR devices (mx4). Revert this fix until a palatable solution is found.

reverts LP: #1517205

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3192
http://jenkins.qa.ubuntu.com/job/mir-ci/5821/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/149/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/149/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5228
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7750
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25982

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

We could just disable this feature for mx4, but thats sub-ideal. The current thinking is that using OpenGLES 3.0's glFenceSync should be more reliable for this platform.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

/tmp/buildd/mir-0.18.0bzr3192pkg0xenial149/tests/acceptance-tests/test_latency.cpp:229: Failure
10: Value of: observed_latency
10: Expected: is < 3.1
10: Actual: 3.62626 (of type float)

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3192
http://jenkins.qa.ubuntu.com/job/mir-ci/5822/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5229
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/139/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5229
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7751
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25984
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/137/console

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

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

> /tmp/buildd/mir-0.18.0bzr3192pkg0xenial149/tests/acceptance-
> tests/test_latency.cpp:229: Failure
> 10: Value of: observed_latency
> 10: Expected: is < 3.1
> 10: Actual: 3.62626 (of type float)

This is:
lp: #1522031

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Confirmed, this is almost a clean revert of r3169, but you missed:

=== renamed file 'include/platform/mir/graphics/egl_extensions.h' => 'src/include/platform/mir/graphics/egl_extensions.h'
=== renamed file 'include/platform/mir/graphics/egl_sync_fence.h' => 'src/include/platform/mir/graphics/egl_sync_fence.h'

Do we care?

Please decide, and then approved...

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

OK

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

headers re-privatized

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Good (assuming it passes CI this time)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5306
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5255/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/100
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/100
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5255
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5255/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7775/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26028

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3194
http://jenkins.qa.ubuntu.com/job/mir-ci/5844/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5254
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/154/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5254
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7774
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/152
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/152/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/11/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26031

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yep.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches