Mir

Mesa fails to support multiple EGLDisplays from a single driver

Bug #1122394 reported by Robert Carr
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Mir
Fix Released
Medium
Robert Carr
Mir 0.0.3

Bug Description

First, allow me to clarify some of the abstractions in mesa-egl as I found the terminology a little confusing.

On one hand, EGL has platforms (PLATFORM_WAYLAND, PLATFORM_X11, PLATFORM_MIR), on the other hand there is a mesa internal notion of an "EGL driver" i.e. dri2, glx.

Currently it is possible to construct one EGLDisplay per driver even with seperate platforms, however to support some of the use cases in https://bugs.launchpad.net/mir/+bug/1122388

we will need to support multiple EGL displays from a single driver (dri2) with seperate platforms.

i.e. running outside a system compositor, mir itself will need EGLDisplay(PLATFORM_DRM), while in process shell clients will need EGLDisplay(PLATFORM_MIR). Likewise within a system compositor mir itself will need EGLDisplay(PLATFORM_MIR, RPCConnection), while shell clients will need another instance of EGLDIsplay(PLATFORM_MIR) created from a local connection (or however this is modelled in response to bug 1122388)

Related branches

lp:~robertcarr/mir/enable-inprocess-egl
Chris Halse Rogers: Approve
Kevin DuBois (community): Approve
PS Jenkins bot (community): Approve (continuous-integration)
Alexandros Frantzis (community): Needs Fixing
Alan Griffiths: Abstain
Diff: 1506 lines (+879/-66)
48 files modified
examples/CMakeLists.txt (+4/-0)
examples/demo-inprocess-egl/CMakeLists.txt (+11/-0)
examples/demo-inprocess-egl/demo_inprocess_egl.cpp (+48/-0)
examples/demo-inprocess-egl/example_egl_helper.cpp (+78/-0)
examples/demo-inprocess-egl/example_egl_helper.h (+53/-0)
examples/demo-inprocess-egl/inprocess_egl_client.cpp (+83/-0)
examples/demo-inprocess-egl/inprocess_egl_client.h (+61/-0)
include/client/mir_toolkit/mir_client_library.h (+0/-7)
include/server/mir/display_server.h (+0/-18)
include/server/mir/graphics/egl/mesa_native_display.h (+42/-0)
include/server/mir/graphics/platform.h (+5/-2)
include/server/mir/shell/focus_sequence.h (+2/-2)
include/shared/mir_toolkit/mesa/native_display.h (+3/-1)
include/test/mir_test_doubles/mock_surface.h (+1/-1)
include/test/mir_test_framework/testing_server_configuration.h (+1/-1)
src/client/gbm/mesa_native_display_container.cpp (+8/-1)
src/client/mir_client_library.cpp (+0/-5)
src/server/display_server.cpp (+1/-0)
src/server/graphics/CMakeLists.txt (+12/-2)
src/server/graphics/android/android_platform.cpp (+6/-0)
src/server/graphics/android/android_platform.h (+2/-0)
src/server/graphics/egl/CMakeLists.txt (+10/-0)
src/server/graphics/egl/mesa_native_display.cpp (+148/-0)
src/server/graphics/gbm/gbm_platform.cpp (+17/-5)
src/server/graphics/gbm/gbm_platform.h (+6/-0)
src/server/shell/application_session.cpp (+1/-1)
src/server/shell/single_visibility_focus_mechanism.cpp (+1/-1)
src/server/shell/surface.cpp (+1/-2)
src/server/shell/surface_source.cpp (+1/-2)
tests/acceptance-tests/test_client_input.cpp (+1/-1)
tests/acceptance-tests/test_test_framework.cpp (+1/-1)
tests/behavior-tests/session_management_context.cpp (+1/-1)
tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+5/-0)
tests/integration-tests/test_display_info.cpp (+4/-1)
tests/integration-tests/test_drm_auth_magic.cpp (+5/-0)
tests/integration-tests/test_surfaceloop.cpp (+10/-0)
tests/mir_test_framework/testing_process_manager.cpp (+1/-1)
tests/mir_test_framework/testing_server_options.cpp (+6/-1)
tests/unit-tests/client/gbm/test_gbm_client_platform.cpp (+6/-4)
tests/unit-tests/frontend/test_session_mediator.cpp (+6/-1)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+5/-0)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+5/-0)
tests/unit-tests/graphics/CMakeLists.txt (+1/-1)
tests/unit-tests/graphics/egl/CMakeLists.txt (+6/-0)
tests/unit-tests/graphics/egl/test_mirserver_mesa_egl_native_display.cpp (+207/-0)
tests/unit-tests/shell/test_application_session.cpp (+1/-1)
tests/unit-tests/shell/test_session_manager.cpp (+1/-1)
tests/unit-tests/shell/test_surface.cpp (+1/-1)
Revision history for this message
Robert Carr (robertcarr) wrote :

This seems to be enough:

=== modified file 'src/egl/main/egldisplay.c'
--- src/egl/main/egldisplay.c 2012-10-05 07:09:03 +0000
+++ src/egl/main/egldisplay.c 2013-02-07 17:41:49 +0000
@@ -196,7 +196,7 @@
 _EGLPlatformType
 _eglGetNativePlatform(EGLNativeDisplayType nativeDisplay)
 {
- static _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM;
+ _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM;
    char *detection_method = NULL;

    if (native_platform == _EGL_INVALID_PLATFORM) {

=== modified file 'src/egl/main/egldriver.c'
--- src/egl/main/egldriver.c 2011-07-02 09:21:31 +0000
+++ src/egl/main/egldriver.c 2013-02-07 17:26:23 +0000
@@ -200,8 +200,8 @@
    lib_handle lib;
    _EGLDriver *drv;

- if (mod->Driver)
- return EGL_TRUE;
+// if (mod->Driver)
+// return EGL_TRUE;

    if (mod->BuiltIn) {
       lib = (lib_handle) NULL;

Robert Ancell (robert-ancell)
Changed in mir:
status: New → Triaged
importance: Undecided → Medium
Daniel van Vugt (vanvugt)
information type: Proprietary → Public
Daniel van Vugt (vanvugt)
Changed in mir:
assignee: nobody → Robert Carr (robertcarr)
status: Triaged → In Progress
Daniel van Vugt (vanvugt)
Changed in mir:
milestone: none → 0.0.3
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

Fix committed into lp:mir at revision 581, scheduled for release in mir, milestone 0.0.3

Changed in mir:
status: In Progress → Fix Committed
Robert Ancell (robert-ancell)
Changed in mir:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.