Merge lp:~kdub/mir/fix-1663062-0.26.1 into lp:~mir-team/mir/0.26-old

[Kevin DuBois]

nested: disable passthrough on MirBuffers backed by ShmBuffer. Attempts to upload ShmBuffer via EGLImageTargetTexture2D doesn't work which was causing LP: #1663062. The ShmBuffer needs to be uploaded via TexImage2D, but more plumbing is needed in the nested platform to do that quickly. As a bonus, don't allocate a buffer to try to infer passthrough capabilities in the nested server.

nested: disable passthrough on MirBuffers backed by ShmBuffer. Attempts to upload ShmBuffer via EGLImageTargetTexture2D doesn't work which was causing LP: #1663062. The ShmBuffer needs to be uploaded via TexImage2D, but more plumbing is needed in the nested platform to do that quickly. As a bonus, don't allocate a buffer to try to infer passthrough capabilities in the nested server.

testing: mesa hardware, mesa software, android hardware, android software (passthrough candidates)

[Cemil Azizoglu (cemil-azizoglu)]

LGTM. Pleased that Android retains passthrough for both.

review: Approve

=== modified file 'src/server/graphics/nested/host_connection.h'
--- src/server/graphics/nested/host_connection.h	2017-02-02 19:38:06 +0000
+++ src/server/graphics/nested/host_connection.h	2017-02-09 18:20:33 +0000
@@ -78,7 +78,7 @@
     virtual std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) = 0;
     virtual std::shared_ptr<NativeBuffer> create_buffer(mir::geometry::Size, MirPixelFormat format) = 0;
     virtual std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) = 0;
-    virtual bool supports_passthrough() = 0;
+    virtual bool supports_passthrough(graphics::BufferUsage) = 0;
 
 protected:
     HostConnection() = default;
 
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-02 19:38:06 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-09 18:20:33 +0000
@@ -854,13 +854,13 @@
     return std::make_unique<SurfaceSpec>(mir_connection);
 }
 
-bool mgn::MirClientHostConnection::supports_passthrough()
+bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage usage)
 {
-    auto buffer = create_buffer(geom::Size{1, 1} , mir_pixel_format_abgr_8888);
-    auto hints = buffer->egl_image_creation_hints();
-    if (std::get<1>(hints) == nullptr && std::get<2>(hints) == nullptr)
-        return false;
-    return true;
+    //FIXME: ShmBuffers currently don't upload properly. The logic here uses
+    //       passthrough where supported (ANativeWindowBuffer and gbm_bo)
+    //       (LP: #1663062 for more details)
+    return (mir_extension_android_buffer_v1(mir_connection) || 
+           ((mir_extension_gbm_buffer_v1(mir_connection) && usage == mg::BufferUsage::hardware)));
 }
 
 namespace
 
=== modified file 'src/server/graphics/nested/mir_client_host_connection.h'
--- src/server/graphics/nested/mir_client_host_connection.h	2017-01-18 19:57:47 +0000
+++ src/server/graphics/nested/mir_client_host_connection.h	2017-02-09 18:20:33 +0000
@@ -87,7 +87,7 @@
     std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) override;
     std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, MirPixelFormat) override;
     std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) override;
-    bool supports_passthrough() override;
+    bool supports_passthrough(BufferUsage usage) override;
 
     optional_value<std::shared_ptr<MesaAuthExtension>> auth_extension() override;
     optional_value<std::shared_ptr<SetGbmExtension>> set_gbm_extension() override;
 
=== modified file 'src/server/graphics/nested/platform.cpp'
--- src/server/graphics/nested/platform.cpp	2017-02-02 18:18:49 +0000
+++ src/server/graphics/nested/platform.cpp	2017-02-09 18:20:33 +0000
@@ -75,7 +75,7 @@
 
     std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override
     {
-        if (passthrough_candidate(properties.size))
+        if (passthrough_candidate(properties.size, properties.usage))
             return std::make_shared<mgn::Buffer>(connection, properties);
         else
             return guest_allocator->alloc_buffer(properties);
@@ -84,7 +84,7 @@
     std::shared_ptr<mg::Buffer> alloc_buffer(
         mir::geometry::Size size, uint32_t native_format, uint32_t native_flags) override
     {
-        if (passthrough_candidate(size))
+        if (passthrough_candidate(size, mg::BufferUsage::hardware))
             return std::make_shared<mgn::Buffer>(connection, size, native_format, native_flags);
         else
             return guest_allocator->alloc_buffer(size, native_format, native_flags);
@@ -92,7 +92,7 @@
 
     std::shared_ptr<mg::Buffer> alloc_software_buffer(mir::geometry::Size size, MirPixelFormat format) override
     {
-        if (passthrough_candidate(size))
+        if (passthrough_candidate(size, mg::BufferUsage::software))
             return std::make_shared<mgn::Buffer>(connection, size, format);
         else
             return guest_allocator->alloc_software_buffer(size, format);
@@ -104,9 +104,10 @@
     }
 
 private:
-    bool passthrough_candidate(mir::geometry::Size size)
+    bool passthrough_candidate(mir::geometry::Size size, mg::BufferUsage usage)
     {
-        return (size.width >= mir::geometry::Width{480}) && (size.height >= mir::geometry::Height{480});
+        return connection->supports_passthrough(usage) &&
+            (size.width >= mir::geometry::Width{480}) && (size.height >= mir::geometry::Height{480});
     }
     std::shared_ptr<mgn::HostConnection> const connection;
     std::shared_ptr<mg::GraphicBufferAllocator> const guest_allocator;
@@ -115,7 +116,8 @@
 
 mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::Platform::create_buffer_allocator()
 {
-    if (connection->supports_passthrough())
+    if (connection->supports_passthrough(mg::BufferUsage::software) ||
+        connection->supports_passthrough(mg::BufferUsage::hardware))
     {
         return mir::make_module_ptr<BufferAllocator>(connection, guest_platform->create_buffer_allocator());
     }
 
=== modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
--- tests/include/mir/test/doubles/stub_host_connection.h	2017-02-02 19:38:06 +0000
+++ tests/include/mir/test/doubles/stub_host_connection.h	2017-02-09 18:20:33 +0000
@@ -177,7 +177,7 @@
         }; 
         return std::make_unique<NullSpec>();
     }
-    bool supports_passthrough()
+    bool supports_passthrough(graphics::BufferUsage)
     {
         return true;
     }