Mir

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

Proposed by Alan Griffiths on 2017-10-14
Status: Merged
Approved by: Brandon Schaefer on 2017-10-16
Approved revision: 4289
Merged at revision: 4291
Proposed branch: lp:~alan-griffiths/mir/fix-1722147
Merge into: lp:mir
Diff against target: 30 lines (+3/-3)
1 file modified
src/platforms/mesa/server/kms/display_buffer.cpp (+3/-3)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1722147
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-10-14 Approve on 2017-10-16
Mir CI Bot continuous-integration Approve on 2017-10-14
Review via email: mp+332270@code.launchpad.net

Commit message

Fix another header for (LP: #1722147)

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

PASSED: Continuous integration, rev:4289
https://mir-jenkins.ubuntu.com/job/mir-ci/3727/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5120
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5358
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5345
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5345
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5345
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5164/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5164/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5164/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5164/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5164/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/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5164/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/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5164/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5164
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5164/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Seems happy

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/kms/display_buffer.cpp'
2--- src/platforms/mesa/server/kms/display_buffer.cpp 2017-07-28 17:00:43 +0000
3+++ src/platforms/mesa/server/kms/display_buffer.cpp 2017-10-14 01:05:56 +0000
4@@ -32,7 +32,7 @@
5 #include <EGL/eglext.h>
6 #include MIR_SERVER_GL_H
7 #include <GLES2/gl2ext.h>
8-#include <drm/drm_fourcc.h>
9+#include <drm_fourcc.h>
10
11 #include <sstream>
12 #include <stdexcept>
13@@ -504,7 +504,7 @@
14 make_current();
15
16 listener->report_successful_egl_make_current_on_construction();
17-
18+
19 glClear(GL_COLOR_BUFFER_BIT);
20
21 surface.swap_buffers();
22@@ -776,7 +776,7 @@
23
24 visible_bypass_frame = scheduled_bypass_frame;
25 scheduled_bypass_frame = nullptr;
26-
27+
28 visible_composite_frame = std::move(scheduled_composite_frame);
29 scheduled_composite_frame = nullptr;
30 }

Subscribers

People subscribed via source and target branches