Mir

Merge lp://staging/~kdub/mir/snapshot-error-checking into lp://staging/mir

  1. snapshot-error-checking
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Work in progress
Proposed branch: lp://staging/~kdub/mir/snapshot-error-checking
Merge into: lp://staging/mir
Diff against target: 298 lines (+171/-12)
6 files modified
src/platform/graphics/android/buffer.cpp (+6/-2)
src/server/scene/gl_pixel_buffer.cpp (+31/-8)
src/server/scene/gl_pixel_buffer.h (+1/-1)
src/server/scene/threaded_snapshot_strategy.cpp (+7/-1)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+19/-0)
tests/unit-tests/scene/test_gl_pixel_buffer.cpp (+107/-0)
To merge this branch: bzr merge lp://staging/~kdub/mir/snapshot-error-checking
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mir development team Pending
Review via email: mp+200595@code.staging.launchpad.net

Commit message

provide the n7 relief from locking up (as in bug 1238695).

This is not a full fix to this problem, as it simply fails nonfatally instead of fatally when we hit the problem that the nexus7 cannot glFramebufferTexture2d with an eglImage (GL_OUT_OF_MEMORY is generated in glEGLTargetTexture2D)

Description of the change

provide the n7 relief from locking up (as in bug 1238695).

This is not a full fix to this problem, as it simply fails nonfatally instead of fatally when we hit the problem that the nexus7 cannot glFramebufferTexture2d with an eglImage (GL_OUT_OF_MEMORY is generated in glEGLTargetTexture2D)

tested with n4 (working as before) and n7 (no screenshots, but unity8 does not go down all the time)

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

FAILED: Continuous integration, rev:1317
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/617/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/563
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/171/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/343
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/346
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/171
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/171/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/195/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2741

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/617/rebuild

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

PASSED: Continuous integration, rev:1317
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/618/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/344
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/347
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/172
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/196
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2743

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/618/rebuild

review: Approve (continuous-integration)
Reply

Unmerged revisions

1317. By Kevin DuBois

cleanup printf

1316. By Kevin DuBois

tests to pass

1315. By Kevin DuBois

more tests to check gl error codes more often

1314. By Kevin DuBois

test to check bad bind

1313. By Kevin DuBois

test to pass

1312. By Kevin DuBois

add a test to check the driver before taking a SS

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