Mir

Merge lp:~alan-griffiths/mir/fix-1699484 into lp:mir

Proposed by Alan Griffiths on 2017-06-28
Status: Merged
Approved by: Brandon Schaefer on 2017-06-28
Approved revision: 4199
Merged at revision: 4200
Proposed branch: lp:~alan-griffiths/mir/fix-1699484
Merge into: lp:mir
Diff against target: 16 lines (+6/-0)
1 file modified
src/platforms/mesa/server/gbm_platform.cpp (+6/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1699484
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve on 2017-06-28
Gerry Boland tentative 2017-06-28 Approve on 2017-06-28
Mir CI Bot continuous-integration Approve on 2017-06-28
Review via email: mp+326408@code.launchpad.net

Commit message

Add missing GBM initialization for Mir on Mir on Mesa that got lost when we split out rendering platforms.

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4199
https://mir-jenkins.ubuntu.com/job/mir-ci/3464/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4728
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4886
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4765/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

Confirmed working on Intel. I can check AMD tomorrow, NVidia too if needed

review: Approve (tentative)
Alan Griffiths (alan-griffiths) wrote :

Also fixes the different manifestation seen on Artful

Brandon Schaefer (brandontschaefer) wrote :

Nice, lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mesa/server/gbm_platform.cpp'
2--- src/platforms/mesa/server/gbm_platform.cpp 2017-05-12 10:00:15 +0000
3+++ src/platforms/mesa/server/gbm_platform.cpp 2017-06-28 09:05:51 +0000
4@@ -50,6 +50,12 @@
5 {
6 BOOST_THROW_EXCEPTION(std::logic_error("no authentication fd to make gbm buffers"));
7 }
8+
9+ {
10+ auto gbm_extension = platform_authentication->set_gbm_extension();
11+ if (gbm_extension.is_set())
12+ gbm_extension.value()->set_gbm_device(gbm->device);
13+ }
14 }
15
16 mgm::GBMPlatform::GBMPlatform(

Subscribers

People subscribed via source and target branches