Mir

Merge lp:~vanvugt/mir/document-full-gl-better into lp:mir

Proposed by Daniel van Vugt on 2016-08-02
Status: Merged
Approved by: Daniel van Vugt on 2016-08-03
Approved revision: 3621
Merged at revision: 3623
Proposed branch: lp:~vanvugt/mir/document-full-gl-better
Merge into: lp:mir
Diff against target: 39 lines (+5/-13)
2 files modified
CMakeLists.txt (+5/-3)
src/platforms/common/server/shm_buffer.cpp (+0/-10)
To merge this branch: bzr merge lp:~vanvugt/mir/document-full-gl-better
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2016-08-03
Cemil Azizoglu (community) 2016-08-02 Approve on 2016-08-02
Chris Halse Rogers 2016-08-02 Pending
Review via email: mp+301742@code.launchpad.net

Commit message

Clarify comments around full desktop GL support. It's likely no further
changes are required in the Mir source and we're just waiting on an
upstream Mesa fix.

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

PASSED: Continuous integration, rev:3621
https://mir-jenkins.ubuntu.com/job/mir-ci/1385/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1666
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1719
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1710
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1710
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1710
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1681
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1681
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1681
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1681
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1681/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1681
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1681/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/440/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1669/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/472/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1685
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1685/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1685
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1685/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1685
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1685/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1685/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1685/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1685
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1685/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1685
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1685/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

Krillin failed, which doesn't seem relevant:

14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device not found
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline
14:38:56 error: device offline

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/443/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1673/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/475/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1726
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1717
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1717
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1717
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1689/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1689/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1689/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-07-13 10:17:52 +0000
3+++ CMakeLists.txt 2016-08-02 03:55:53 +0000
4@@ -207,9 +207,11 @@
5
6 #
7 # Full OpenGL support is possibly complete but not yet perfect. So is
8-# presently disabled by default. See the TODOs in:
9-# src/platform/graphics/egl_extensions.cpp: glEGLImageTargetTexture2DOES
10-# src/platforms/common/server/shm_buffer.cpp: glTexImage2D
11+# presently disabled by default due to:
12+# 1. Black windows bug: https://bugs.freedesktop.org/show_bug.cgi?id=92265
13+# 2. Use of glEGLImageTargetTexture2DOES in:
14+# src/platform/graphics/egl_extensions.cpp
15+# possibly shouldn't work even though it does. Or should it?
16 #
17 #if (TARGET_ARCH STREQUAL "x86_64-linux-gnu" OR
18 # TARGET_ARCH STREQUAL "i386-linux-gnu")
19
20=== modified file 'src/platforms/common/server/shm_buffer.cpp'
21--- src/platforms/common/server/shm_buffer.cpp 2016-06-02 05:33:50 +0000
22+++ src/platforms/common/server/shm_buffer.cpp 2016-08-02 03:55:53 +0000
23@@ -138,16 +138,6 @@
24 */
25 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
26
27- /*
28- * TODO: Get a fix for Mesa black windows bug:
29- * https://bugs.freedesktop.org/show_bug.cgi?id=92265
30- * Although this syntax works for GLES, Mesa will reject it
31- * if you switch to desktop GL. You can override internalformat
32- * to ((format == GL_BGRA_EXT) ? GL_RGBA : format) as a
33- * workaround but that's actually incorrect and won't work
34- * for other drivers (also shouldn't work for Mesa after the
35- * bug gets fixed).
36- */
37 glTexImage2D(GL_TEXTURE_2D, 0, format,
38 size_.width.as_int(), size_.height.as_int(),
39 0, format, type, pixels);

Subscribers

People subscribed via source and target branches