Mir

Merge lp:~albaguirre/mir/fix-1498045 into lp:mir

  1. fix-1498045
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Alberto Aguirre
Approved revision: no longer in the source branch.
Merged at revision: 2959
Proposed branch: lp:~albaguirre/mir/fix-1498045
Merge into: lp:mir
Diff against target: 72 lines (+26/-9)
1 file modified
src/server/compositor/multi_threaded_compositor.cpp (+26/-9)
To merge this branch: bzr merge lp:~albaguirre/mir/fix-1498045
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+271844@code.launchpad.net

Commit message

Use a different compositor ID per each display buffer.

When compositing a display sync group that contains multiple display buffers, use a unique compositor ID for each of those buffers instead of single ID. This avoids issues in the RenderingTracker which expects each compositor to have a unique ID.

Description of the change

Use a different compositor ID per each display buffer.

When compositing a display sync group that contains multiple display buffers, use a unique compositor ID for each of those buffers instead of single ID. This avoids issues in the RenderingTracker which expects each compositor to have a unique ID.

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

PASSED: Continuous integration, rev:2953
http://jenkins.qa.ubuntu.com/job/mir-ci/4978/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2980
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1128
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4016
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4016/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6717
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23548

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

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Couldn't we use the address of the DisplayBufferCompositor as an ID instead of calculating offsets from "this"?

I.e. Get rid of comp_count, comp_id and std::get<2>() and just use std::get<1>().get()?

review: Needs Information
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Yeah that seems better.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

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

lgtm too. as noted in ~kdub/mir/nbs-multimonitor-guarantee, would help if we sourced id's from the swapping logic (so that logic knows how many ids are around. If IDs were opaque classes, they could even conveniently hide information in the ID!).

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

PASSED: Continuous integration, rev:2954
http://jenkins.qa.ubuntu.com/job/mir-ci/4989/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1139
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4031
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4031/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6729
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23580

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

review: Approve (continuous-integration)

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