Merge lp:~cemil-azizoglu/mir/use_egl_native_window into lp:mir

[Cemil Azizoglu]

Introduce use_egl_native_window()

=== modified file '.bzrignore'
--- .bzrignore	2016-08-26 19:50:25 +0000
+++ .bzrignore	2016-09-01 23:11:16 +0000
@@ -1,3 +1,4 @@
 .idea
 .project
 include/server/mir/version.h
+build-*
 
=== modified file 'src/include/client/mir/client_platform.h'
--- src/include/client/mir/client_platform.h	2016-05-03 06:55:25 +0000
+++ src/include/client/mir/client_platform.h	2016-09-01 23:11:16 +0000
@@ -63,7 +63,8 @@
     virtual std::shared_ptr<ClientBufferFactory> create_buffer_factory() = 0;
     // EGLNativeWindowType differs between platforms, so can't reasonably be used in the
     // platform-independent interface.
-    virtual std::shared_ptr<void> create_egl_native_window(EGLNativeSurface *surface) = 0;
+    virtual std::shared_ptr<void> create_egl_native_window(EGLNativeSurface* surface) = 0;
+    virtual void use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface) = 0;
     virtual std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() = 0;
     virtual MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const = 0;
     virtual MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const = 0;
 
=== modified file 'src/platforms/android/client/android_client_platform.cpp'
--- src/platforms/android/client/android_client_platform.cpp	2016-07-20 04:54:07 +0000
+++ src/platforms/android/client/android_client_platform.cpp	2016-09-01 23:11:16 +0000
@@ -57,7 +57,13 @@
     return std::make_shared<mcla::AndroidClientBufferFactory>(registrar);
 }
 
-std::shared_ptr<void> mcla::AndroidClientPlatform::create_egl_native_window(EGLNativeSurface *surface)
+void mcla::AndroidClientPlatform::use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface)
+{
+    auto anw = std::static_pointer_cast<mga::MirNativeWindow>(native_window);
+    anw->use_native_surface(std::make_shared<mcla::EGLNativeSurfaceInterpreter>(*surface));
+}
+
+std::shared_ptr<void> mcla::AndroidClientPlatform::create_egl_native_window(EGLNativeSurface* surface)
 {
     auto log = getenv("MIR_CLIENT_ANDROID_WINDOW_REPORT");
     std::shared_ptr<mga::NativeWindowReport> report;
@@ -67,9 +73,14 @@
             std::make_shared<mir::logging::DumbConsoleLogger>());
     else
         report = std::make_shared<mga::NullNativeWindowReport>();
- 
-    return std::make_shared<mga::MirNativeWindow>(
-        std::make_shared<mcla::EGLNativeSurfaceInterpreter>(*surface), report);
+
+    std::shared_ptr<mga::AndroidDriverInterpreter> surface_interpreter;
+    if (surface)
+        surface_interpreter = std::make_shared<mcla::EGLNativeSurfaceInterpreter>(*surface);
+    else
+        surface_interpreter = std::make_shared<mcla::ErrorDriverInterpreter>();
+
+    return std::make_shared<mga::MirNativeWindow>(surface_interpreter, report);
 }
 
 std::shared_ptr<EGLNativeDisplayType>
 
=== modified file 'src/platforms/android/client/android_client_platform.h'
--- src/platforms/android/client/android_client_platform.h	2016-05-03 06:55:25 +0000
+++ src/platforms/android/client/android_client_platform.h	2016-09-01 23:11:16 +0000
@@ -37,7 +37,8 @@
     void populate(MirPlatformPackage& package) const override;
     MirPlatformMessage* platform_operation(MirPlatformMessage const* request) override;
     std::shared_ptr<ClientBufferFactory> create_buffer_factory() override;
-    std::shared_ptr<void> create_egl_native_window(EGLNativeSurface *surface) override;
+    std::shared_ptr<void> create_egl_native_window(EGLNativeSurface* surface) override;
+    void use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
 
=== modified file 'src/platforms/android/client/egl_native_surface_interpreter.h'
--- src/platforms/android/client/egl_native_surface_interpreter.h	2016-01-29 08:18:22 +0000
+++ src/platforms/android/client/egl_native_surface_interpreter.h	2016-09-01 23:11:16 +0000
@@ -21,6 +21,7 @@
 
 #include "android_driver_interpreter.h"
 #include "mir/egl_native_surface.h"
+#include <boost/throw_exception.hpp>
 
 namespace mir
 {
@@ -36,6 +37,22 @@
 namespace android
 {
 
+class ErrorDriverInterpreter : public graphics::android::AndroidDriverInterpreter
+{
+public:
+#define THROW_EXCEPTION \
+{ \
+    BOOST_THROW_EXCEPTION(std::logic_error("error: use_egl_native_window(...) has not yet been called"));\
+}
+    graphics::NativeBuffer* driver_requests_buffer() override THROW_EXCEPTION
+    void driver_returns_buffer(ANativeWindowBuffer*, int) override THROW_EXCEPTION
+    void dispatch_driver_request_format(int) override THROW_EXCEPTION
+    void dispatch_driver_request_buffer_count(unsigned int) override THROW_EXCEPTION
+    int  driver_requests_info(int) const override THROW_EXCEPTION
+    void sync_to_display(bool) override THROW_EXCEPTION
+#undef THROW_EXCEPTION
+};
+
 class EGLNativeSurfaceInterpreter : public graphics::android::AndroidDriverInterpreter
 {
 public:
 
=== modified file 'src/platforms/android/common/mir_native_window.cpp'
--- src/platforms/android/common/mir_native_window.cpp	2016-07-20 04:54:07 +0000
+++ src/platforms/android/common/mir_native_window.cpp	2016-09-01 23:11:16 +0000
@@ -322,3 +322,9 @@
     MIR_LOG_DRIVER_BOUNDARY_EXCEPTION(e);
     return -1;
 }
+
+void mga::MirNativeWindow::use_native_surface(
+    std::shared_ptr<AndroidDriverInterpreter> const& interpreter)
+{
+    driver_interpreter = interpreter;
+}
 
=== modified file 'src/platforms/android/include/mir_native_window.h'
--- src/platforms/android/include/mir_native_window.h	2016-07-20 04:54:07 +0000
+++ src/platforms/android/include/mir_native_window.h	2016-09-01 23:11:16 +0000
@@ -50,8 +50,9 @@
     int cancelBuffer(struct ANativeWindowBuffer* buffer, int fence);
     int cancelBufferDeprecated(struct ANativeWindowBuffer* buffer);
     int setSwapInterval(int interval);
+    void use_native_surface(std::shared_ptr<AndroidDriverInterpreter> const& interpreter);
 private:
-    std::shared_ptr<AndroidDriverInterpreter> const driver_interpreter;
+    std::shared_ptr<AndroidDriverInterpreter> driver_interpreter;
     std::shared_ptr<NativeWindowReport> const report;
     std::shared_ptr<SyncFileOps> const sync_ops;
     std::vector<struct ANativeWindowBuffer*> cancelled_buffers;
 
=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp	2016-08-03 12:27:57 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp	2016-09-01 23:11:16 +0000
@@ -39,7 +39,11 @@
     return std::make_shared<mcle::ClientBufferFactory>();
 }
 
-std::shared_ptr<void> mcle::ClientPlatform::create_egl_native_window(EGLNativeSurface* /*client_surface*/)
+void mcle::ClientPlatform::use_egl_native_window(std::shared_ptr<void> /*native_window*/, EGLNativeSurface* /*surface*/)
+{
+}
+
+std::shared_ptr<void> mcle::ClientPlatform::create_egl_native_window(EGLNativeSurface* /*surface*/)
 {
     return nullptr;
 }
 
=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h	2016-08-03 06:48:47 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h	2016-09-01 23:11:16 +0000
@@ -37,6 +37,7 @@
     MirPlatformMessage* platform_operation(MirPlatformMessage const* request) override;
     std::shared_ptr<ClientBufferFactory> create_buffer_factory() override;
     std::shared_ptr<void> create_egl_native_window(EGLNativeSurface *surface) override;
+    void use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
 
=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2016-08-26 19:50:25 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2016-09-01 23:11:16 +0000
@@ -74,9 +74,15 @@
     return std::make_shared<mclm::ClientBufferFactory>(buffer_file_ops);
 }
 
+void mclm::ClientPlatform::use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface)
+{
+    auto mnw = std::static_pointer_cast<NativeSurface>(native_window);
+    mnw->use_native_surface(surface);
+}
+
 std::shared_ptr<void> mclm::ClientPlatform::create_egl_native_window(EGLNativeSurface* client_surface)
 {
-    return std::make_shared<NativeSurface>(*client_surface);
+    return std::make_shared<NativeSurface>(client_surface);
 }
 
 std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display()
 
=== modified file 'src/platforms/mesa/client/client_platform.h'
--- src/platforms/mesa/client/client_platform.h	2016-05-03 06:55:25 +0000
+++ src/platforms/mesa/client/client_platform.h	2016-09-01 23:11:16 +0000
@@ -45,7 +45,8 @@
     void populate(MirPlatformPackage& package) const override;
     MirPlatformMessage* platform_operation(MirPlatformMessage const* request) override;
     std::shared_ptr<ClientBufferFactory> create_buffer_factory() override;
-    std::shared_ptr<void> create_egl_native_window(EGLNativeSurface *surface) override;
+    std::shared_ptr<void> create_egl_native_window(EGLNativeSurface* surface) override;
+    void use_egl_native_window(std::shared_ptr<void> native_window, EGLNativeSurface* surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
 
=== modified file 'src/platforms/mesa/client/native_surface.cpp'
--- src/platforms/mesa/client/native_surface.cpp	2015-04-28 07:54:10 +0000
+++ src/platforms/mesa/client/native_surface.cpp	2016-09-01 23:11:16 +0000
@@ -27,6 +27,10 @@
 
 namespace mclm=mir::client::mesa;
 
+#define THROW_IF_NULL(s) \
+    if (!(s)) \
+        throw std::logic_error("error: use_egl_native_window(...) has not yet been called");
+
 namespace
 {
 static int advance_buffer_static(MirMesaEGLNativeSurface* surface,
@@ -50,7 +54,7 @@
 }
 }
 
-mclm::NativeSurface::NativeSurface(EGLNativeSurface& surface)
+mclm::NativeSurface::NativeSurface(EGLNativeSurface* surface)
     : starting(true), surface(surface)
 {
     surface_advance_buffer = advance_buffer_static;
@@ -61,6 +65,8 @@
 int mclm::NativeSurface::advance_buffer(MirBufferPackage* buffer_package)
 try
 {
+    THROW_IF_NULL(surface);
+
     /*
      * At present dri2_create_mir_window_surface will trigger
      * mir_advance_colour_buffer which will land here. Since we're still
@@ -70,9 +76,9 @@
     if (starting)
         starting = false;
     else
-        surface.request_and_wait_for_next_buffer();
+        surface->request_and_wait_for_next_buffer();
 
-    auto buffer = surface.get_current_buffer();
+    auto buffer = surface->get_current_buffer();
 
     auto buffer_to_driver = buffer->native_buffer_handle();
     memcpy(buffer_package, buffer_to_driver.get(), sizeof(MirBufferPackage));
@@ -87,7 +93,8 @@
 int mclm::NativeSurface::get_parameters(MirSurfaceParameters* surface_parameters)
 try
 {
-    auto params = surface.get_parameters();
+    THROW_IF_NULL(surface);
+    auto params = surface->get_parameters();
     memcpy(surface_parameters, &params, sizeof(MirSurfaceParameters));
     return MIR_MESA_TRUE;
 }
@@ -100,10 +107,12 @@
 int mclm::NativeSurface::set_swapinterval(int interval)
 try
 {
+    THROW_IF_NULL(surface);
+
     if ((interval < 0) || (interval > 1))
         return MIR_MESA_FALSE;
 
-    surface.request_and_wait_for_configure(mir_surface_attrib_swapinterval, interval);
+    surface->request_and_wait_for_configure(mir_surface_attrib_swapinterval, interval);
     return MIR_MESA_TRUE;
 }
 catch (std::exception const& e)
@@ -111,3 +120,8 @@
     MIR_LOG_DRIVER_BOUNDARY_EXCEPTION(e);
     return MIR_MESA_FALSE;
 }
+
+void mclm::NativeSurface::use_native_surface(EGLNativeSurface* native_surface)
+{
+    surface = native_surface;
+}
 
=== modified file 'src/platforms/mesa/client/native_surface.h'
--- src/platforms/mesa/client/native_surface.h	2015-04-28 07:54:10 +0000
+++ src/platforms/mesa/client/native_surface.h	2016-09-01 23:11:16 +0000
@@ -32,15 +32,16 @@
 class NativeSurface : public MirMesaEGLNativeSurface
 {
 public:
-    explicit NativeSurface(EGLNativeSurface&);
+    explicit NativeSurface(EGLNativeSurface*);
 
     int advance_buffer(MirBufferPackage* buffer_package);
     int get_parameters(MirSurfaceParameters* surface_parameters);
     int set_swapinterval(int interval);
+    void use_native_surface(EGLNativeSurface* native_surface);
 
 private:
     bool starting;
-    EGLNativeSurface& surface;
+    EGLNativeSurface* surface;
 };
 
 }
 
=== modified file 'src/platforms/mesa/include/native_buffer.h'
--- src/platforms/mesa/include/native_buffer.h	2016-08-03 18:07:27 +0000
+++ src/platforms/mesa/include/native_buffer.h	2016-09-01 23:11:16 +0000
@@ -20,6 +20,8 @@
 #define MIR_GRAPHICS_MESA_NATIVE_BUFFER_H_
 
 #include <mir_toolkit/mir_native_buffer.h>
+
+#include <stdlib.h>
 #include <gbm.h>
 
 namespace mir
 
=== modified file 'tests/acceptance-tests/throwback/test_client_library_errors.cpp'
--- tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-08-25 01:11:51 +0000
+++ tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-09-01 23:11:16 +0000
@@ -78,6 +78,10 @@
             dummy_client_module.load_function<mcl::CreateClientPlatform>("create_client_platform")(context);
     }
 
+    void use_egl_native_window(std::shared_ptr<void> /*native_window*/, mir::client::EGLNativeSurface* /*surface*/) override
+    {
+    }
+
     std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface *surface) override
     {
         if (should_fail<Method::create_egl_native_window, failure_set>())
 
=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	2016-08-12 18:41:22 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2016-09-01 23:11:16 +0000
@@ -33,6 +33,7 @@
     void populate(MirPlatformPackage& package) const override;
     MirPlatformMessage* platform_operation(MirPlatformMessage const*) override;
     std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory() override;
+    void use_egl_native_window(std::shared_ptr<void> native_window, mir::client::EGLNativeSurface* surface) override;
     std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface* surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const override;
 
=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	2016-08-09 13:40:44 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2016-09-01 23:11:16 +0000
@@ -71,6 +71,10 @@
     return std::make_shared<StubPlatformBufferFactory>();
 }
 
+void mtf::StubClientPlatform::use_egl_native_window(std::shared_ptr<void> /*native_window*/, mir::client::EGLNativeSurface* /*surface*/)
+{
+}
+
 std::shared_ptr<void> mtf::StubClientPlatform::create_egl_native_window(mir::client::EGLNativeSurface* surface)
 {
     return std::shared_ptr<void>{surface, [](void*){}};
 
=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp	2016-08-10 10:43:39 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp	2016-09-01 23:11:16 +0000
@@ -71,6 +71,9 @@
     void populate(MirPlatformPackage& /* package */) const override
     {
     }
+    void use_egl_native_window(std::shared_ptr<void> /*native_window*/, mcl::EGLNativeSurface* /*surface*/) override
+    {
+    }
     std::shared_ptr<void> create_egl_native_window(mcl::EGLNativeSurface * /* surface */) override
     {
         return mt::fake_shared(egl_native_window);
 
=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2016-06-28 12:18:18 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2016-09-01 23:11:16 +0000
@@ -206,6 +206,7 @@
     MOCK_CONST_METHOD0(platform_type, MirPlatformType());
     MOCK_METHOD1(platform_operation, MirPlatformMessage*(MirPlatformMessage const*));
     MOCK_METHOD0(create_buffer_factory, std::shared_ptr<mcl::ClientBufferFactory>());
+    MOCK_METHOD2(use_egl_native_window, void(std::shared_ptr<void>, mcl::EGLNativeSurface*));
     MOCK_METHOD1(create_egl_native_window, std::shared_ptr<void>(mcl::EGLNativeSurface*));
     MOCK_METHOD0(create_egl_native_display, std::shared_ptr<EGLNativeDisplayType>());
     MOCK_CONST_METHOD2(get_egl_pixel_format,
 
=== modified file 'tests/unit-tests/platforms/android/CMakeLists.txt'
--- tests/unit-tests/platforms/android/CMakeLists.txt	2016-08-05 15:32:58 +0000
+++ tests/unit-tests/platforms/android/CMakeLists.txt	2016-09-01 23:11:16 +0000
@@ -4,6 +4,11 @@
   ${ANDROID_HEADERS_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/platforms/android/include
 )
+
+set(
+  ANDROID_UNIT_TEST_SOURCES
+)
+
 add_subdirectory("server")
 add_subdirectory("client")
 
 
=== modified file 'tests/unit-tests/platforms/android/client/test_android_client_platform.cpp'
--- tests/unit-tests/platforms/android/client/test_android_client_platform.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/platforms/android/client/test_android_client_platform.cpp	2016-09-01 23:11:16 +0000
@@ -16,6 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
+#include "mir_native_window.h"
 #include "mir/client_platform.h"
 #include "mir/test/doubles/mock_client_context.h"
 #include "mir/test/doubles/mock_egl_native_surface.h"
@@ -59,6 +60,20 @@
     EXPECT_NE(nullptr, egl_native_window);
 }
 
+TEST_F(AndroidClientPlatformTest, egl_native_window_can_be_set_with_null_native_surface)
+{
+    auto egl_native_window = platform->create_egl_native_window(nullptr);
+    EXPECT_NE(nullptr, egl_native_window);
+}
+
+TEST_F(AndroidClientPlatformTest, error_interpreter_used_with_null_native_surface)
+{
+    auto egl_native_window = platform->create_egl_native_window(nullptr);
+    auto native_window = reinterpret_cast<mir::graphics::android::MirNativeWindow*>(egl_native_window.get());
+    ANativeWindow& window = *native_window;
+    EXPECT_EQ(window.setSwapInterval(&window, 1), -1);
+}
+
 TEST_F(AndroidClientPlatformTest, egl_pixel_format_asks_the_driver)
 {
     auto const d = reinterpret_cast<EGLDisplay>(0x1234);
 
=== modified file 'tests/unit-tests/platforms/android/client/test_android_native_window.cpp'
--- tests/unit-tests/platforms/android/client/test_android_native_window.cpp	2016-08-24 02:09:08 +0000
+++ tests/unit-tests/platforms/android/client/test_android_native_window.cpp	2016-09-01 23:11:16 +0000
@@ -73,6 +73,22 @@
 
 }
 
+TEST_F(AndroidNativeWindowTest, use_native_surface_call_replaces_existing_interpreter)
+{
+    std::shared_ptr<MockAndroidDriverInterpreter> const new_driver_interpreter =
+        std::make_shared<NiceMock<MockAndroidDriverInterpreter>>();
+
+    // Test that the call goes to the new interpreter instead of the old one
+    EXPECT_CALL(*mock_driver_interpreter, sync_to_display(true))
+        .Times(0);
+
+    EXPECT_CALL(*new_driver_interpreter, sync_to_display(true))
+        .Times(1);
+
+    mir_native_window.use_native_surface(new_driver_interpreter);
+    window.setSwapInterval(&window, 1);
+}
+
 TEST_F(AndroidNativeWindowTest, native_window_swapinterval)
 {
     ASSERT_NE(nullptr, window.setSwapInterval);
 
=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
--- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2016-05-26 03:59:12 +0000
+++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2016-09-01 23:11:16 +0000
@@ -22,6 +22,7 @@
 #include "src/platforms/mesa/client/mesa_native_display_container.h"
 #include "mir_test_framework/client_platform_factory.h"
 #include "mir/test/doubles/mock_egl.h"
+#include "mir/test/doubles/mock_egl_native_surface.h"
 
 #include "mir_toolkit/mir_client_library.h"
 #include "mir_toolkit/mesa/native_display.h"
@@ -155,3 +156,16 @@
     EXPECT_EQ(mir_pixel_format_xrgb_8888, platform->get_egl_pixel_format(d, c));
     EXPECT_EQ(mir_pixel_format_invalid, platform->get_egl_pixel_format(d, c));
 }
+
+TEST_F(MesaClientPlatformTest, egl_native_window_is_set)
+{
+    testing::NiceMock<mtd::MockEGLNativeSurface> mock_surface;
+    auto egl_native_window = platform->create_egl_native_window(&mock_surface);
+    EXPECT_NE(nullptr, egl_native_window);
+}
+
+TEST_F(MesaClientPlatformTest, egl_native_window_can_be_set_with_null_native_surface)
+{
+    auto egl_native_window = platform->create_egl_native_window(nullptr);
+    EXPECT_NE(nullptr, egl_native_window);
+}
 
=== modified file 'tests/unit-tests/platforms/mesa/client/test_native_surface.cpp'
--- tests/unit-tests/platforms/mesa/client/test_native_surface.cpp	2016-05-03 06:55:25 +0000
+++ tests/unit-tests/platforms/mesa/client/test_native_surface.cpp	2016-09-01 23:11:16 +0000
@@ -16,18 +16,20 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
+#include "src/platforms/mesa/include/native_buffer.h"
 #include "src/platforms/mesa/client/native_surface.h"
 #include "mir/client_buffer.h"
 #include "mir/test/doubles/mock_egl_native_surface.h"
 #include "mir/test/doubles/mock_client_buffer.h"
-
+#include "mir/test/fake_shared.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-namespace mtd=mir::test::doubles;
-namespace mcl=mir::client;
-namespace mcl=mir::client;
-namespace mclg=mir::client::mesa;
+namespace mt=mir::test;
+namespace mtd=mt::doubles;
+namespace mcl=mir::client;
+namespace mg=mir::graphics;
+namespace mclg=mcl::mesa;
 namespace geom=mir::geometry;
 
 class MesaClientNativeSurfaceTest : public ::testing::Test
@@ -44,18 +46,24 @@
             .WillByDefault(Return(surf_params));
         ON_CALL(mock_surface, get_current_buffer())
             .WillByDefault(Return(
-                std::make_shared<NiceMock<mtd::MockClientBuffer>>()));
+                mt::fake_shared(mock_buffer)));
+        ON_CALL(mock_buffer, native_buffer_handle())
+            .WillByDefault(Return(
+                mt::fake_shared(native_buffer)));
     }
 
     MirSurfaceParameters surf_params;
+    const char* error_msg = "thrown as part of test";
+    mg::NativeBuffer native_buffer;
+    testing::NiceMock<mtd::MockClientBuffer> mock_buffer;
     testing::NiceMock<mtd::MockEGLNativeSurface> mock_surface;
-    mclg::NativeSurface native_surface{mock_surface};
+    mclg::NativeSurface native_surface{&mock_surface};
 };
 
 TEST_F(MesaClientNativeSurfaceTest, basic_parameters)
 {
     MirSurfaceParameters params;
-    native_surface.surface_get_parameters(&native_surface, &params);
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.surface_get_parameters(&native_surface, &params));
     EXPECT_EQ(surf_params.width, params.width);
     EXPECT_EQ(surf_params.height, params.height);
     EXPECT_EQ(surf_params.pixel_format, params.pixel_format);
@@ -72,7 +80,7 @@
     EXPECT_CALL(mock_surface, get_current_buffer())
         .Times(1);
 
-    native_surface.surface_advance_buffer(&native_surface, &buffer_package);
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.surface_advance_buffer(&native_surface, &buffer_package));
 }
 
 TEST_F(MesaClientNativeSurfaceTest, basic_advance)
@@ -88,8 +96,8 @@
     EXPECT_CALL(mock_surface, get_current_buffer())
         .Times(1);
 
-    native_surface.surface_advance_buffer(&native_surface, &buffer_package);
-    native_surface.surface_advance_buffer(&native_surface, &buffer_package);
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.surface_advance_buffer(&native_surface, &buffer_package));
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.surface_advance_buffer(&native_surface, &buffer_package));
 }
 
 TEST_F(MesaClientNativeSurfaceTest, swapinterval_request)
@@ -102,8 +110,8 @@
     EXPECT_CALL(mock_surface, request_and_wait_for_configure(mir_surface_attrib_swapinterval,1))
         .InSequence(seq);
 
-    native_surface.set_swapinterval(0);
-    native_surface.set_swapinterval(1);
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.set_swapinterval(0));
+    EXPECT_EQ(MIR_MESA_TRUE, native_surface.set_swapinterval(1));
 }
 
 TEST_F(MesaClientNativeSurfaceTest, swapinterval_unsupported_request)
@@ -119,10 +127,10 @@
     using namespace testing;
 
     EXPECT_CALL(mock_surface, get_current_buffer())
-        .WillOnce(Throw(std::runtime_error("")));
+        .WillOnce(Throw(std::runtime_error(error_msg)));
 
     MirBufferPackage buffer_package;
-    EXPECT_THAT(native_surface.advance_buffer(&buffer_package), Eq(MIR_MESA_FALSE));
+    EXPECT_EQ(MIR_MESA_FALSE, native_surface.advance_buffer(&buffer_package));
 }
 
 TEST_F(MesaClientNativeSurfaceTest, returns_error_on_get_parameters_failure)
@@ -130,10 +138,10 @@
     using namespace testing;
 
     EXPECT_CALL(mock_surface, get_parameters())
-        .WillOnce(Throw(std::runtime_error("")));
+        .WillOnce(Throw(std::runtime_error(error_msg)));
 
     MirSurfaceParameters surface_params;
-    EXPECT_THAT(native_surface.get_parameters(&surface_params), Eq(MIR_MESA_FALSE));
+    EXPECT_EQ(MIR_MESA_FALSE, native_surface.get_parameters(&surface_params));
 }
 
 TEST_F(MesaClientNativeSurfaceTest, returns_error_on_set_swap_interval_failure)
@@ -141,7 +149,42 @@
     using namespace testing;
 
     EXPECT_CALL(mock_surface, request_and_wait_for_configure(_,_))
-        .WillOnce(Throw(std::runtime_error("")));
-
-    EXPECT_THAT(native_surface.set_swapinterval(0), Eq(MIR_MESA_FALSE));
+        .WillOnce(Throw(std::runtime_error(error_msg)));
+
+    EXPECT_EQ(MIR_MESA_FALSE, native_surface.set_swapinterval(0));
+}
+
+TEST_F(MesaClientNativeSurfaceTest, null_native_surface_returns_error)
+{
+    using namespace testing;
+
+    MirSurfaceParameters params;
+    MirBufferPackage buffer_package;
+
+    mclg::NativeSurface null_native_surface{nullptr};
+
+    EXPECT_EQ(MIR_MESA_FALSE,
+        null_native_surface.surface_get_parameters(&null_native_surface, &params));
+    EXPECT_EQ(MIR_MESA_FALSE,
+        null_native_surface.surface_advance_buffer(&null_native_surface, &buffer_package));
+    EXPECT_EQ(MIR_MESA_FALSE,
+        null_native_surface.surface_set_swapinterval(&null_native_surface, 1));
+}
+
+TEST_F(MesaClientNativeSurfaceTest, native_surface_after_null_returns_success)
+{
+    using namespace testing;
+
+    MirSurfaceParameters params;
+    MirBufferPackage buffer_package;
+
+    mclg::NativeSurface native_surface{nullptr};
+
+    native_surface.use_native_surface(&mock_surface);
+    EXPECT_EQ(MIR_MESA_TRUE,
+        native_surface.surface_get_parameters(&native_surface, &params));
+    EXPECT_EQ(MIR_MESA_TRUE,
+            native_surface.surface_advance_buffer(&native_surface, &buffer_package));
+    EXPECT_EQ(MIR_MESA_TRUE,
+            native_surface.surface_set_swapinterval(&native_surface, 1));
 }