Mir

Merge lp://qastaging/~afrantzis/mir/display-gl-agnostic into lp://qastaging/mir

  1. display-gl-agnostic
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3619
Proposed branch: lp://qastaging/~afrantzis/mir/display-gl-agnostic
Merge into: lp://qastaging/mir
Diff against target: 1272 lines (+267/-166)
41 files modified
benchmarks/frame-uniformity/CMakeLists.txt (+1/-0)
examples/render_surfaces.cpp (+11/-2)
include/platform/mir/graphics/display.h (+0/-8)
include/platform/mir/graphics/gl_context.h (+0/-44)
include/renderers/gl/mir/renderer/gl/context.h (+47/-0)
include/renderers/gl/mir/renderer/gl/context_source.h (+49/-0)
include/test/mir/test/doubles/null_display.h (+7/-5)
include/test/mir/test/doubles/null_gl_context.h (+2/-2)
src/include/server/mir/graphics/surfaceless_egl_context.h (+2/-2)
src/platform/symbols.map (+0/-8)
src/platforms/android/server/device_quirks.cpp (+4/-2)
src/platforms/android/server/device_quirks.h (+2/-2)
src/platforms/android/server/display.cpp (+5/-6)
src/platforms/android/server/display.h (+5/-2)
src/platforms/android/server/gl_context.cpp (+1/-1)
src/platforms/android/server/gl_context.h (+3/-3)
src/platforms/android/server/hwc_fallback_gl_renderer.cpp (+2/-2)
src/platforms/android/server/hwc_fallback_gl_renderer.h (+2/-1)
src/platforms/eglstream-kms/server/display.cpp (+14/-13)
src/platforms/eglstream-kms/server/display.h (+5/-3)
src/platforms/mesa/server/kms/display.cpp (+7/-7)
src/platforms/mesa/server/kms/display.h (+5/-2)
src/platforms/mesa/server/x11/graphics/display.cpp (+5/-5)
src/platforms/mesa/server/x11/graphics/display.h (+5/-2)
src/platforms/mesa/server/x11/graphics/gl_context.h (+2/-2)
src/server/compositor/compositing_screencast.cpp (+0/-1)
src/server/compositor/screencast_display_buffer.cpp (+11/-2)
src/server/compositor/screencast_display_buffer.h (+12/-4)
src/server/graphics/nested/display.cpp (+6/-7)
src/server/graphics/nested/display.h (+6/-3)
src/server/scene/default_configuration.cpp (+12/-2)
src/server/scene/gl_pixel_buffer.cpp (+2/-2)
src/server/scene/gl_pixel_buffer.h (+9/-3)
tests/include/mir/test/doubles/mock_display.h (+0/-2)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+0/-4)
tests/unit-tests/graphics/android/test_display_generic.cpp (+0/-1)
tests/unit-tests/graphics/android/test_hwc_fallback_gl_renderer.cpp (+2/-2)
tests/unit-tests/graphics/mesa/kms/test_display_generic.cpp (+0/-1)
tests/unit-tests/graphics/mesa/x11/test_display_generic.cpp (+0/-1)
tests/unit-tests/graphics/test_display.h (+15/-2)
tests/unit-tests/scene/test_gl_pixel_buffer.cpp (+6/-5)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/display-gl-agnostic
Reviewer Review Type Date Requested Status
Daniel van Vugt Abstain
Alan Griffiths Approve
Cemil Azizoglu (community) Approve
Kevin DuBois (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+301364@code.qastaging.launchpad.net

Commit message

platform: Move GL specific methods from mg::Display to mir::renderer::gl::ContextSource

Description of the change

platform: Move GL specific methods from mg::Display to mir::renderer::gl::ContextSource

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

FAILED: Continuous integration, rev:3616
https://mir-jenkins.ubuntu.com/job/mir-ci/1363/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1628/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1681
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1672
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1672
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1672
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1643
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1643/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/1643
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1643/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/1643/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1643/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1643/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Slave went offline during the build

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3617
https://mir-jenkins.ubuntu.com/job/mir-ci/1364/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1629
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1682
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1673
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1673
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1673
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1644
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1644/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/1644
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1644/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/1644
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1644/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/1644
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1644/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/1644
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1644/artifact/output/*zip*/output.zip

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

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

lgtm

review: Approve
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

LGTM

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

There's a platform ABI break. So there's a bunch of stuff that needs updating. (Feel free land anyway and do that in a separate MP)

review: Needs Fixing
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> There's a platform ABI break. So there's a bunch of stuff that needs updating. (Feel free land anyway and do that in a separate MP)

The platform ABI (+ friends) has already been bumped since 0.24.0 was branched, so I think we are OK (just don't tell me we have rebranched 0.24.0 again :)).

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

ContextSource feels overly abstract and ugly. Certainly it's increasing code size and complexity. I'm wondering if we can come up with something more clear than the factory approach...

review: Needs Information
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> ContextSource feels overly abstract and ugly. Certainly it's increasing code size and complexity. I'm wondering if we can come up with something more clear than the factory approach...

I don't agree with your sentiments, but I am open to any suggestions for improvements or alternative approaches.

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

> > There's a platform ABI break. So there's a bunch of stuff that needs
> updating. (Feel free land anyway and do that in a separate MP)
>
> The platform ABI (+ friends) has already been bumped since 0.24.0 was
> branched, so I think we are OK (just don't tell me we have rebranched 0.24.0
> again :)).

I missed that. sorry

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I guess GLContext being a class (and thus an object with an address) is part of the problem and that's pre-existing.

We have bigger fish to fry right now...

review: Abstain

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