Merge lp:~robertcarr/mir/fix-multiple-internal-client-surfaces-on-android into lp:~mir-team/mir/trunk

[Robert Carr]

Fix multiple internal client surfaces on android.

Fix multiple internal client surfaces on android.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1065
http://jenkins.qa.ubuntu.com/job/mir-ci/1498/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1906
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/736/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/12/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1498/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1065
http://jenkins.qa.ubuntu.com/job/mir-ci/1503/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/741
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1503/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Can we have a test and/or description of the problem addressed by this?

review: Needs Information

[Robert Carr (robertcarr)]

The problem is when unity attempts to create multiple surfaces in process, the EGLWindow is reuused due to the previous caching logic, regardless of the surface.

Then of course eglCreateWindowSurface on the second surface fails.

[Daniel van Vugt (vanvugt)]

The first return is redundant and can be removed:

23 + return client_windows[surface].get();
24 }
25
26 - return client_window.get();
27 + return client_windows[surface].get();
28 }

review: Needs Fixing

[Kevin DuBois (kdub)]

looks ok, we still have the pre-existing condition that there's no way to return a client egl native window... but that's pre-existing

review: Approve

[Robert Carr (robertcarr)]

Daniels comments are fixed too so top approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1962
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/347/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-autolanding/22
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-autolanding/22/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I think map could be unordered_map in this case. But it's fine.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1066
http://jenkins.qa.ubuntu.com/job/mir-ci/1538/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1968
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/52/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1538/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-autolanding/25
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-autolanding/25/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/server/graphics/android/internal_client.cpp'
--- src/server/graphics/android/internal_client.cpp	2013-08-28 03:41:48 +0000
+++ src/server/graphics/android/internal_client.cpp	2013-09-20 13:19:55 +0000
@@ -24,7 +24,6 @@
 namespace mga=mir::graphics::android;
 
 mga::InternalClient::InternalClient()
-    : client_window(0)
 {
 }
 
@@ -35,12 +34,12 @@
 
 EGLNativeWindowType mga::InternalClient::egl_native_window(std::shared_ptr<InternalSurface> const& surface)
 {
-    if (!client_window)
+    if (!client_windows[surface])
     {
         auto cache = std::make_shared<mga::InterpreterCache>();
         auto interpreter = std::make_shared<mga::InternalClientWindow>(surface, cache); 
-        client_window = std::make_shared<mga::MirNativeWindow>(interpreter);
+        client_windows[surface] = std::make_shared<mga::MirNativeWindow>(interpreter);
     }
 
-    return client_window.get();
+    return client_windows[surface].get();
 }

=== modified file 'src/server/graphics/android/internal_client.h'
--- src/server/graphics/android/internal_client.h	2013-08-28 03:41:48 +0000
+++ src/server/graphics/android/internal_client.h	2013-09-20 13:19:55 +0000
@@ -21,6 +21,7 @@
 
 #include "mir/graphics/internal_client.h"
 #include <memory>
+#include <map>
 
 namespace mir
 {
@@ -37,7 +38,7 @@
     EGLNativeWindowType egl_native_window(std::shared_ptr<InternalSurface> const&);
 
 private:
-    std::shared_ptr<MirNativeWindow> client_window;
+    std::map<std::shared_ptr<InternalSurface>, std::shared_ptr<MirNativeWindow>> client_windows;
 };
 }
 }