Mir

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

Proposed by Alan Griffiths on 2017-10-25
Status: Merged
Approved by: Alan Griffiths on 2017-10-26
Approved revision: 4305
Merged at revision: 4304
Proposed branch: lp:~alan-griffiths/mir/fix-1720223
Merge into: lp:mir
Diff against target: 45 lines (+3/-4)
2 files modified
debian/changelog (+1/-1)
src/platforms/mesa/server/buffer_allocator.cpp (+2/-3)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1720223
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-10-25
Brandon Schaefer (community) 2017-10-25 Approve on 2017-10-25
Review via email: mp+332785@code.launchpad.net

Commit message

Send Wayland frame notifications during compositing even if a buffer is reused. (LP: #1720223)

To post a comment you must log in.
lp:~alan-griffiths/mir/fix-1720223 updated on 2017-10-25
4303. By Alan Griffiths on 2017-10-25

Don't forget changelog

Mir CI Bot (mir-ci-bot) wrote :

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

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

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

Confirmed working here. Nice fix!

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4303
https://mir-jenkins.ubuntu.com/job/mir-ci/3759/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5174/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5411/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5398/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5398/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5398/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5217/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5217/console

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

review: Needs Fixing (continuous-integration)
lp:~alan-griffiths/mir/fix-1720223 updated on 2017-10-25
4304. By Alan Griffiths on 2017-10-25

merge :parent

4305. By Alan Griffiths on 2017-10-25

Dedup 0.28.1 bugfixes

Mir CI Bot (mir-ci-bot) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-10-24 10:30:48 +0000
3+++ debian/changelog 2017-10-25 15:19:32 +0000
4@@ -19,11 +19,11 @@
5 . [miral-app, miral-desktop] Default to using SDL's Wayland support.
6 . Use system GMock detection (unless cross-compiling)
7 - Bugs fixed:
8- . Build process depends on debian toolchain. (LP: #1724202)
9 . Wayland demo client doesn't cross-compile. (LP: #1723971)
10 . mir fails to find drm.h. (LP: #1722147)
11 . Don't treat failing to bypass buffers as a fatal error. (LP: #1723235)
12 . Build process depends on Debian toolchain. (LP: #1724202)
13+ . XWayland clients updates not causing redraw (LP: #1720223)
14
15 -- Alan Griffiths <alan@Octopull-desktop> Tue, 17 Oct 2017 14:14:37 +0100
16
17
18=== modified file 'src/platforms/mesa/server/buffer_allocator.cpp'
19--- src/platforms/mesa/server/buffer_allocator.cpp 2017-09-27 20:44:14 +0000
20+++ src/platforms/mesa/server/buffer_allocator.cpp 2017-10-25 15:19:32 +0000
21@@ -421,8 +421,6 @@
22
23 if (egl_image == EGL_NO_IMAGE_KHR)
24 BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGLImage"));
25-
26- on_consumed();
27 }
28 lock.unlock();
29
30@@ -436,6 +434,7 @@
31
32 void secure_for_render() override
33 {
34+ on_consumed();
35 }
36
37 std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const override
38@@ -537,7 +536,7 @@
39
40 std::shared_ptr<mg::EGLExtensions> const extensions;
41
42- std::function<void()> on_consumed;
43+ std::function<void()> const on_consumed;
44 };
45 }
46

Subscribers

People subscribed via source and target branches