Merge lp:~robertcarr/mir/multiwin-egl-example into lp:mir

[Robert Carr]

Add support for multiple windows to mir_demo_client_scroll to demonstrate multiple EGL windows from one connection is failing!

While investigating some nested multi-monitor issues on Mesa, I wondered if there was something to demonstrate rendering to multiple EGL surfaces created from the same connection from multiple threads (as nested behaves in the case of multiple nested outputs!). I found that there was not so I added support to mir_demo_client_scroll.

Unfortunately it does not work as I will shortly document in a bug.

[Robert Carr (robertcarr)]

Related bug: https://bugs.launchpad.net/mir/+bug/1285500

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1429
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/950/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/682
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/687
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/650
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/621
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4334

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/950/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I guess it is pre-existing, but why can't we do as the other examples do and exit cleanly?

review: Approve

[Kevin DuBois (kdub)]

seems like we're landing a failing 'test', but calling it an example. I suppose this is unusual but okay as long as a test makes lands along with the fix.

review: Abstain

[Alexandros Frantzis (afrantzis)]

> I guess it is pre-existing, but why can't we do as the other examples do and exit cleanly?

+1, the program shutdown code is useless since it never gets executed...

review: Approve

[Chris Halse Rogers (raof)]

You've broken specifying -m (the getopt string should be "hm:w:", because both m and w have a mandatory argument).

Also, this doesn't actually trigger the bug for me; if you're seeing problems, they're not the same as the nested-multi-output hang. That doesn't make this change unuseful, though. Fix the getopt string and you've got an approved from me.

review: Needs Fixing

=== modified file 'examples/scroll.cpp'
--- examples/scroll.cpp	2014-02-14 09:27:02 +0000
+++ examples/scroll.cpp	2014-02-27 05:47:13 +0000
@@ -23,46 +23,21 @@
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 
+#include <thread>
+
 static char const *socket_file = NULL;
-
-int main(int argc, char* argv[])
+static EGLDisplay disp;
+
+
+void create_and_run_scroll_surface(MirConnection *connection)
 {
-    MirConnection *connection = 0;
     MirSurface *surface = 0;
-    int arg;
-    opterr = 0;
-    while ((arg = getopt (argc, argv, "hm:")) != -1)
-    {
-        switch (arg)
-        {
-        case 'm':
-            socket_file = optarg;
-            break;
-
-        case '?':
-        case 'h':
-        default:
-            puts(argv[0]);
-            puts("Usage:");
-            puts("    -m <Mir server socket>");
-            puts("    -h: this help text");
-            return -1;
-        }
-    }
-
-    puts("Starting");
-
-    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
-    assert(connection != NULL);
-    assert(mir_connection_is_valid(connection));
-    assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
-    puts("Connected");
-
     MirPixelFormat pixel_format;
     unsigned int valid_formats;
     mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
@@ -79,7 +54,6 @@
 
     /* egl setup */
     int major, minor, n, rc;
-    EGLDisplay disp;
     EGLContext context;
     EGLSurface egl_surface;
     EGLConfig egl_config;
@@ -93,13 +67,9 @@
         EGL_NONE };
     EGLint context_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
 
-    EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
     EGLNativeWindowType native_window = (EGLNativeWindowType) mir_surface_get_egl_native_window(surface);
     assert(native_window != (EGLNativeWindowType)NULL);
 
-    disp = eglGetDisplay(native_display);
-    assert(disp != EGL_NO_DISPLAY);
-
     rc = eglInitialize(disp, &major, &minor);
     assert(rc == EGL_TRUE);
     assert(major == 1);
@@ -131,16 +101,67 @@
 
     eglDestroySurface(disp, egl_surface);
     eglDestroyContext(disp, context);
-    eglTerminate(disp);
-
+    
     mir_surface_release_sync(surface);
     puts("Surface released");
+}
+
+int main(int argc, char* argv[])
+{
+    MirConnection *connection = 0;
+    unsigned num_windows = 1;
+    int arg;
+    opterr = 0;
+    while ((arg = getopt (argc, argv, "hmw:")) != -1)
+    {
+        switch (arg)
+        {
+        case 'm':
+            socket_file = optarg;
+            break;
+        case 'w':
+            num_windows = atoi(optarg);
+            break;
+        case '?':
+        case 'h':
+        default:
+            puts(argv[0]);
+            puts("Usage:");
+            puts("    -m <Mir server socket>");
+            puts("    -w <Number of windows to create>:");
+            puts("    -h: this help text");
+            return -1;
+        }
+    }
+
+    puts("Starting");
+
+    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
+    assert(connection != NULL);
+    assert(mir_connection_is_valid(connection));
+    assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
+    puts("Connected");
+
+    EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
+    disp = eglGetDisplay(native_display);
+    assert(disp != EGL_NO_DISPLAY);
+
+    if (num_windows == 1)
+    {
+        create_and_run_scroll_surface(connection);
+    }
+    else
+    {
+        for (unsigned i = 0; i < num_windows; i++) std::thread(create_and_run_scroll_surface, connection).detach();
+        for(;;) {}
+    }
+    
+
+    eglTerminate(disp);
 
     mir_connection_release(connection);
     puts("Connection released");
 
-    (void)rc;
-
     return 0;
 }