Merge lp:~kdub/mir/client-buffer-recommendations into lp:mir

[Kevin DuBois]

client: add platform-specific conversions for MirBufferUsage and MirPixelFormat to the client platform.

The current system says "i want a 'hardware' buffer", and the server selects something appropriate. The new system with gbm_buffer and android_buffer extensions, actually lets the user select the properties they want. This is more flexible, but we have to have some legacy code (mostly hardware BufferStreams) make a platform-specific conversion on the client side.

client: add platform-specific conversions for MirBufferUsage and MirPixelFormat to the client platform.

The current system says "i want a 'hardware' buffer", and the server selects something appropriate. The new system with gbm_buffer and android_buffer extensions, actually lets the user select the properties they want. This is more flexible, but we have to have some legacy code (mostly hardware BufferStreams) make a platform-specific conversion on the client side.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3955
https://mir-jenkins.ubuntu.com/job/mir-ci/2758/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3610/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3682
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3672
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3672
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3672
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3637/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3637
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3637/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3637
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3637/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3637
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3637/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3637
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3637/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3637
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3637/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2758/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3958
https://mir-jenkins.ubuntu.com/job/mir-ci/2781/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3644
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3719
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3709
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3709
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3709
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3671
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3671/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2781/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

+inline static uint32_t convert_to_android_usage(BufferUsage usage)

The "static" implies that this is intended to be C99 compatible, but it's in a C++ namespace, so I don't see why it is there.

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1004/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3662/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1059/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3741
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3731
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3731
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3731
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3689/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3689/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3689/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lp: #1613523 and lp: #1616312

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/include/client/mir/client_platform.h'
--- src/include/client/mir/client_platform.h	2017-01-18 02:29:37 +0000
+++ src/include/client/mir/client_platform.h	2017-01-19 17:21:43 +0000
@@ -19,6 +19,7 @@
 #define MIR_CLIENT_CLIENT_PLATFORM_H_
 
 #include "mir/graphics/native_buffer.h"
+#include "mir/geometry/size.h"
 #include "mir_toolkit/client_types.h"
 #include "mir_toolkit/mir_native_buffer.h"
 
@@ -72,6 +73,8 @@
     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;
+    virtual uint32_t native_format_for(MirPixelFormat) const = 0;
+    virtual uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const = 0;
 };
 
 }

=== modified file 'src/platforms/android/client/android_client_platform.cpp'
--- src/platforms/android/client/android_client_platform.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/client/android_client_platform.cpp	2017-01-19 17:21:43 +0000
@@ -290,3 +290,13 @@
         return &fence_extension;
     return nullptr;
 }
+
+uint32_t mcla::AndroidClientPlatform::native_format_for(MirPixelFormat format) const
+{
+    return mga::to_android_format(format);
+}
+
+uint32_t mcla::AndroidClientPlatform::native_flags_for(MirBufferUsage usage, mir::geometry::Size) const
+{
+    return mga::convert_to_android_usage(static_cast<mir::graphics::BufferUsage>(usage));
+}

=== modified file 'src/platforms/android/client/android_client_platform.h'
--- src/platforms/android/client/android_client_platform.h	2017-01-18 02:29:37 +0000
+++ src/platforms/android/client/android_client_platform.h	2017-01-19 17:21:43 +0000
@@ -47,6 +47,8 @@
     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;
+    uint32_t native_format_for(MirPixelFormat) const override;
+    uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
 
 private:
     ClientContext* const context;

=== modified file 'src/platforms/android/include/android_format_conversion-inl.h'
--- src/platforms/android/include/android_format_conversion-inl.h	2016-08-04 08:42:11 +0000
+++ src/platforms/android/include/android_format_conversion-inl.h	2017-01-19 17:21:43 +0000
@@ -19,9 +19,11 @@
 #ifndef MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 #define MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 
+#include "mir/graphics/buffer_properties.h"
 #include "mir_toolkit/common.h"
 #include <cstddef>  // to fix missing #includes in graphics.h
 #include <system/graphics.h>
+#include <hardware/gralloc.h>
 
 namespace mir
 {
@@ -70,6 +72,19 @@
     }
 }
 
+inline static uint32_t convert_to_android_usage(BufferUsage usage)
+{
+    switch (usage)
+    {
+    case BufferUsage::hardware:
+        return (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER);
+    case BufferUsage::software:
+        return (GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE);
+    default:
+        return -1;
+    }
+}
+
 }
 }
 }

=== modified file 'src/platforms/android/server/graphic_buffer_allocator.cpp'
--- src/platforms/android/server/graphic_buffer_allocator.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/server/graphic_buffer_allocator.cpp	2017-01-19 17:21:43 +0000
@@ -82,22 +82,6 @@
         alloc_dev_ptr, cmdstream_sync_factory, quirks);
 }
 
-namespace
-{
-uint32_t convert_to_android_usage(mg::BufferUsage usage)
-{
-    switch (usage)
-    {
-    case mg::BufferUsage::hardware:
-        return (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER);
-    case mg::BufferUsage::software:
-        return (GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE);
-    default:
-        return -1;
-    }
-}
-}
-
 std::shared_ptr<mg::Buffer> mga::GraphicBufferAllocator::alloc_buffer(
     mg::BufferProperties const& properties)
 {
@@ -106,7 +90,7 @@
         alloc_device->alloc_buffer(
             properties.size, 
             mga::to_android_format(properties.format),
-            convert_to_android_usage(properties.usage)),
+            mga::convert_to_android_usage(properties.usage)),
         egl_extensions);
 }
 
@@ -142,7 +126,7 @@
         alloc_device->alloc_buffer(
             size,
             mga::to_android_format(format),
-            convert_to_android_usage(mg::BufferUsage::software)),
+            mga::convert_to_android_usage(mg::BufferUsage::software)),
         egl_extensions);
 }
 

=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp	2017-01-19 17:21:43 +0000
@@ -85,3 +85,13 @@
 {
     return nullptr;
 }
+
+uint32_t mcle::ClientPlatform::native_format_for(MirPixelFormat) const
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error{"no buffer support"});
+}
+
+uint32_t mcle::ClientPlatform::native_flags_for(MirBufferUsage, mir::geometry::Size) const
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error{"no buffer support"});
+}

=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h	2017-01-18 02:29:37 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h	2017-01-19 17:21:43 +0000
@@ -42,6 +42,8 @@
     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;
+    uint32_t native_format_for(MirPixelFormat) const override;
+    uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
 };
 
 }

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2017-01-19 17:21:43 +0000
@@ -33,6 +33,7 @@
 #include <stdexcept>
 #include <cstring>
 
+namespace mgm=mir::graphics::mesa;
 namespace mcl=mir::client;
 namespace mclm=mir::client::mesa;
 namespace geom=mir::geometry;
@@ -289,3 +290,16 @@
 
     return nullptr;
 }
+
+uint32_t mclm::ClientPlatform::native_format_for(MirPixelFormat format) const
+{
+    return mgm::mir_format_to_gbm_format(format);
+}
+
+uint32_t mclm::ClientPlatform::native_flags_for(MirBufferUsage, mir::geometry::Size size) const
+{
+    uint32_t bo_flags{GBM_BO_USE_RENDERING};
+    if (size.width.as_uint32_t() >= 800 && size.height.as_uint32_t() >= 600)
+        bo_flags |= GBM_BO_USE_SCANOUT;
+    return bo_flags;
+}

=== modified file 'src/platforms/mesa/client/client_platform.h'
--- src/platforms/mesa/client/client_platform.h	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/client/client_platform.h	2017-01-19 17:21:43 +0000
@@ -54,6 +54,8 @@
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     void set_gbm_device(gbm_device*);
+    uint32_t native_format_for(MirPixelFormat) const override;
+    uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
 
 private:
     ClientContext* const context;

=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	2017-01-18 02:29:37 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2017-01-19 17:21:43 +0000
@@ -49,6 +49,9 @@
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
+    uint32_t native_format_for(MirPixelFormat) const override;
+    uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
+
     mir::client::ClientContext* const context;
     MirBufferPackage mutable native_buffer;
 

=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	2017-01-18 02:29:37 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2017-01-19 17:21:43 +0000
@@ -181,6 +181,16 @@
     return nullptr;
 }
 
+uint32_t mtf::StubClientPlatform::native_format_for(MirPixelFormat) const
+{
+    return 0u;
+}
+
+uint32_t mtf::StubClientPlatform::native_flags_for(MirBufferUsage, mir::geometry::Size) const
+{
+    return 0u;
+}
+
 std::shared_ptr<mcl::ClientPlatform>
 mtf::StubClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
 {

=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp	2017-01-19 17:21:43 +0000
@@ -103,6 +103,14 @@
     {
         return nullptr;
     }
+    uint32_t native_format_for(MirPixelFormat) const override
+    {
+        return 0u;
+    }
+    uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override
+    {
+        return 0u;
+    }
 
     static EGLNativeWindowType egl_native_window;
     std::shared_ptr<mcl::ClientBufferFactory> const buffer_factory;

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2017-01-19 17:21:43 +0000
@@ -211,7 +211,8 @@
     MOCK_METHOD0(create_egl_native_display, std::shared_ptr<EGLNativeDisplayType>());
     MOCK_CONST_METHOD2(get_egl_pixel_format, MirPixelFormat(EGLDisplay, EGLConfig));
     MOCK_METHOD2(request_interface, void*(char const*, int));
-
+    MOCK_CONST_METHOD1(native_format_for, uint32_t(MirPixelFormat));
+    MOCK_CONST_METHOD2(native_flags_for, uint32_t(MirBufferUsage, mir::geometry::Size));
     mcl::ClientContext* client_context = nullptr;
 };
 

=== modified file 'tests/unit-tests/client/test_mir_render_surface.cpp'
--- tests/unit-tests/client/test_mir_render_surface.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/client/test_mir_render_surface.cpp	2017-01-19 17:21:43 +0000
@@ -131,6 +131,8 @@
     MOCK_METHOD0(create_egl_native_display, std::shared_ptr<EGLNativeDisplayType>());
     MOCK_CONST_METHOD2(get_egl_pixel_format, MirPixelFormat(EGLDisplay, EGLConfig));
     MOCK_METHOD2(request_interface, void*(char const*, int));
+    MOCK_CONST_METHOD1(native_format_for, uint32_t(MirPixelFormat));
+    MOCK_CONST_METHOD2(native_flags_for, uint32_t(MirBufferUsage, mir::geometry::Size));
 
     mcl::ClientContext* client_context = nullptr;
 };

=== modified file 'tests/unit-tests/platforms/android/client/test_android_client_platform.cpp'
--- tests/unit-tests/platforms/android/client/test_android_client_platform.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/platforms/android/client/test_android_client_platform.cpp	2017-01-19 17:21:43 +0000
@@ -117,6 +117,24 @@
     EXPECT_EQ(mir_pixel_format_invalid, platform->get_egl_pixel_format(d, c));
 }
 
+TEST_F(AndroidClientPlatformTest, translates_format_to_hal_pixel_formats)
+{
+    EXPECT_THAT(platform->native_format_for(mir_pixel_format_abgr_8888), Eq(HAL_PIXEL_FORMAT_RGBA_8888));
+    EXPECT_THAT(platform->native_format_for(mir_pixel_format_xbgr_8888), Eq(HAL_PIXEL_FORMAT_RGBX_8888));
+}
+
+TEST_F(AndroidClientPlatformTest, translates_usage_to_gralloc_bits)
+{
+    auto hw_usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
+    auto sw_usage =
+        GRALLOC_USAGE_SW_WRITE_OFTEN |
+        GRALLOC_USAGE_SW_READ_OFTEN |
+        GRALLOC_USAGE_HW_COMPOSER |
+        GRALLOC_USAGE_HW_TEXTURE;
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_software, {}), Eq(sw_usage));
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_hardware, {}), Eq(hw_usage));
+}
+
 //TODO: platform helper uses anon namespace in header
 struct ClientExtensions : Test
 {

=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
--- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2017-01-19 17:21:43 +0000
@@ -45,6 +45,8 @@
 namespace mcl = mir::client;
 namespace mclm = mir::client::mesa;
 namespace mtf = mir_test_framework;
+namespace geom = mir::geometry;
+using namespace testing;
 
 namespace
 {
@@ -109,8 +111,6 @@
 
 TEST_F(MesaClientPlatformTest, handles_set_gbm_device_platform_operation)
 {
-    using namespace testing;
-
     int const success{0};
     auto const gbm_dev_dummy = reinterpret_cast<gbm_device*>(this);
 
@@ -132,8 +132,6 @@
 
 TEST_F(MesaClientPlatformTest, appends_gbm_device_to_platform_package)
 {
-    using namespace testing;
-
     MirPlatformPackage pkg;
     platform->populate(pkg);
     int const previous_data_count{pkg.data_items};
@@ -160,8 +158,6 @@
 
 TEST_F(MesaClientPlatformTest, returns_gbm_compatible_pixel_formats_only)
 {
-    using namespace testing;
-
     auto const d = reinterpret_cast<EGLDisplay>(0x1234);
     auto const c = reinterpret_cast<EGLConfig>(0x5678);
 
@@ -197,7 +193,6 @@
 
 TEST_F(MesaClientPlatformTest, can_allocate_buffer)
 {
-    using namespace testing;
     using namespace std::literals::chrono_literals;
 
     mtd::StubConnectionConfiguration conf(platform);
@@ -219,3 +214,22 @@
         [] (::MirBuffer*, void*) {}, nullptr);
     EXPECT_THAT(conf.channel->channel_call_count, Eq(call_count + 1));
 }
+
+TEST_F(MesaClientPlatformTest, converts_gbm_format_correctly)
+{
+    EXPECT_THAT(platform->native_format_for(mir_pixel_format_argb_8888), Eq(GBM_FORMAT_ARGB8888));
+    EXPECT_THAT(platform->native_format_for(mir_pixel_format_xrgb_8888), Eq(GBM_FORMAT_XRGB8888));
+}
+
+TEST_F(MesaClientPlatformTest, converts_gbm_flags_correctly)
+{
+    auto render_flag = GBM_BO_USE_RENDERING;
+    auto render_and_scanout_flag = GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT;
+
+    geom::Size large_size {800, 600}; 
+    geom::Size small_size {400, 100}; 
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_software, large_size), Eq(render_and_scanout_flag));
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_software, small_size), Eq(render_flag));
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_hardware, large_size), Eq(render_and_scanout_flag));
+    EXPECT_THAT(platform->native_flags_for(mir_buffer_usage_hardware, small_size), Eq(render_flag));
+}