Merge lp:~alan-griffiths/mir/remove-BufferInitializer into lp:mir

[Alan Griffiths]

graphics: remove BufferInitializer

graphics: remove BufferInitializer

This isn't a useful customization point - it was only ever used in render_surfaces and it wasn't needed there.

Although changing the signature of Platform::create_buffer_allocator() is an API change, that API isn't used in any downstream that I know of.

[Kevin DuBois (kdub)]

Its one of the older classes in the code, and I agree that it hasn't gotten much useful customization and use, so I'm okay with its removal. This does break platform api, not sure what to do about that (sometimes we increment, sometimes we don't). I'd guess because this doesn't reach very far outside of the mir project we shouldn't increment. Apart from that issue though, approve.

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

Not related to this change: where did the green background for render_surfaces go?

review: Approve

[Alan Griffiths (alan-griffiths)]

> Its one of the older classes in the code, and I agree that it hasn't gotten
> much useful customization and use, so I'm okay with its removal. This does
> break platform api, not sure what to do about that (sometimes we increment,
> sometimes we don't). I'd guess because this doesn't reach very far outside of
> the mir project we shouldn't increment. Apart from that issue though, approve.

We do need to sort out the platform API (e.g. publish the headers needed to implement a driver platform). But I think that's for another MP.

[lp:~alan-griffiths/mir/remove-BufferInitializer]

1990. By Alan Griffiths on 2014-10-16

spike making render_surfaces an example once more

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1989
http://jenkins.qa.ubuntu.com/job/mir-ci/1836/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2162
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2091/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/176
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/176/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1028/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1990
http://jenkins.qa.ubuntu.com/job/mir-ci/1838/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1030
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3091
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14767

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

review: Approve (continuous-integration)

=== modified file 'examples/render_overlays.cpp'
--- examples/render_overlays.cpp	2014-10-06 03:02:44 +0000
+++ examples/render_overlays.cpp	2014-10-16 14:20:32 +0000
@@ -169,7 +169,7 @@
 
     auto platform = conf.the_graphics_platform();
     auto display = conf.the_display();
-    auto buffer_allocator = platform->create_buffer_allocator(conf.the_buffer_initializer());
+    auto buffer_allocator = platform->create_buffer_allocator();
 
      mg::BufferProperties buffer_properties{
         geom::Size{512, 512},
 
=== modified file 'include/platform/mir/graphics/native_platform.h'
--- include/platform/mir/graphics/native_platform.h	2014-10-06 03:02:44 +0000
+++ include/platform/mir/graphics/native_platform.h	2014-10-16 14:20:32 +0000
@@ -32,7 +32,6 @@
 namespace graphics
 {
 class GraphicBufferAllocator;
-class BufferInitializer;
 class PlatformIPCPackage;
 class InternalClient;
 class BufferIpcMessage;
@@ -48,8 +47,7 @@
 
     virtual void initialize(std::shared_ptr<NestedContext> const& nested_context) = 0;
 
-    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
+    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator() = 0;
 
     virtual std::shared_ptr<PlatformIPCPackage> connection_ipc_package() = 0;
 
 
=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2014-09-24 17:01:33 +0000
+++ include/platform/mir/graphics/platform.h	2014-10-16 14:20:32 +0000
@@ -44,7 +44,6 @@
 {
 class Buffer;
 class Display;
-class BufferInitializer;
 class InternalClient;
 class DisplayReport;
 class DisplayConfigurationPolicy;
@@ -75,12 +74,8 @@
 
     /**
      * Creates the buffer allocator subsystem.
-     *
-     * \param [in] buffer_initializer the object responsible for initializing the buffers
      */
-
-    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
+    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator() = 0;
     
     virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
 
 
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-10-14 11:48:16 +0000
+++ include/server/mir/default_server_configuration.h	2014-10-16 14:20:32 +0000
@@ -107,7 +107,6 @@
 class NativePlatform;
 class Platform;
 class Display;
-class BufferInitializer;
 class DisplayReport;
 class GraphicBufferAllocator;
 class BufferWriter;
@@ -189,7 +188,6 @@
     /** @name graphics configuration - customization
      * configurable interfaces for modifying graphics
      *  @{ */
-    virtual std::shared_ptr<graphics::BufferInitializer> the_buffer_initializer();
     virtual std::shared_ptr<compositor::RendererFactory>   the_renderer_factory();
     virtual std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy();
     virtual std::shared_ptr<graphics::nested::HostConnection> the_host_connection();
@@ -372,7 +370,6 @@
     CachedPtr<input::TouchVisualizer> touch_visualizer;
     CachedPtr<graphics::Platform>     graphics_platform;
     CachedPtr<graphics::NativePlatform>    graphics_native_platform;
-    CachedPtr<graphics::BufferInitializer> buffer_initializer;
     CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
     CachedPtr<graphics::BufferWriter> buffer_writer;
     CachedPtr<graphics::Display>      display;
 
=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-10-06 03:02:44 +0000
+++ platform-ABI-sha1sums	2014-10-16 14:20:32 +0000
@@ -35,8 +35,8 @@
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
 f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
-b4aaa941df9c0a6f9342629b26542700876f3aaa  include/platform/mir/graphics/native_platform.h
-f47dac961f060eb29a44ed3c8c18a49a3d353bb1  include/platform/mir/graphics/platform.h
+d4ab0ef9544345fcc85740f6ed6d8118728a5c59  include/platform/mir/graphics/native_platform.h
+109d2c82d245a512e7c1790a3b853c9c275ebd4d  include/platform/mir/graphics/platform.h
 1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
 9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
 
=== modified file 'playground/render_surfaces.cpp'
--- playground/render_surfaces.cpp	2014-09-12 05:56:28 +0000
+++ playground/render_surfaces.cpp	2014-10-16 14:20:32 +0000
@@ -25,7 +25,6 @@
 #include "mir/scene/surface_creation_parameters.h"
 #include "mir/geometry/size.h"
 #include "mir/geometry/rectangles.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/gl_context.h"
@@ -72,9 +71,7 @@
 ///\section RenderSurfacesServerConfiguration RenderSurfacesServerConfiguration
 /// The configuration stubs out client connectivity and input.
 /// \snippet render_surfaces.cpp RenderSurfacesServerConfiguration_stubs_tag
-/// it also provides a bespoke buffer initializer
-/// \snippet render_surfaces.cpp RenderResourcesBufferInitializer_tag
-/// and a bespoke display buffer compositor
+/// it also provides a bespoke display buffer compositor
 /// \snippet render_surfaces.cpp RenderSurfacesDisplayBufferCompositor_tag
 ///\section Utilities Utility classes
 /// For smooth animation we need to track time and move surfaces accordingly
@@ -248,41 +245,6 @@
     }
     ///\internal [RenderSurfacesServerConfiguration_stubs_tag]
 
-    ///\internal [RenderResourcesBufferInitializer_tag]
-    // Override for a bespoke buffer initializer
-    std::shared_ptr<mg::BufferInitializer> the_buffer_initializer() override
-    {
-        class RenderResourcesBufferInitializer : public mg::BufferInitializer
-        {
-        public:
-            RenderResourcesBufferInitializer(std::unique_ptr<mg::GLContext> gl_context)
-                : gl_context{std::move(gl_context)}
-            {
-            }
-
-            void operator()(mg::Buffer& buffer)
-            {
-                auto using_gl_context = mir::raii::paired_calls(
-                    [this] { gl_context->make_current(); },
-                    [this] { gl_context->release_current(); });
-
-                mt::ImageRenderer img_renderer{mir_image.pixel_data,
-                               geom::Size{mir_image.width, mir_image.height},
-                               mir_image.bytes_per_pixel};
-                mt::BufferRenderTarget brt{buffer};
-                brt.make_current();
-                img_renderer.render();
-            }
-
-        private:
-            std::unique_ptr<mg::GLContext> const gl_context;
-
-        };
-
-        return std::make_shared<RenderResourcesBufferInitializer>(the_display()->create_gl_context());
-    }
-    ///\internal [RenderResourcesBufferInitializer_tag]
-
     // Unless the compositor starts before we create the surfaces it won't respond to
     // the change notification that causes.
     std::shared_ptr<mir::ServerStatusListener> the_server_status_listener()
@@ -389,6 +351,8 @@
 
         auto const display = the_display();
         auto const surface_coordinator = the_surface_coordinator();
+        auto const gl_context = the_display()->create_gl_context();
+
         /* TODO: Get proper configuration */
         geom::Rectangles view_area;
         display->for_each_display_buffer([&view_area](mg::DisplayBuffer const& db)
@@ -413,16 +377,23 @@
                                    .of_buffer_usage(mg::BufferUsage::hardware),
                     nullptr);
 
-            /*
-             * We call swap_buffers() twice so that the surface is
-             * considers the first buffer to be posted.
-             * (TODO There must be a better way!)
-             */
             {
                 mg::Buffer* buffer{nullptr};
                 auto const complete = [&](mg::Buffer* new_buf){ buffer = new_buf; };
-                s->swap_buffers(buffer, complete);
-                s->swap_buffers(buffer, complete);
+                s->swap_buffers(buffer, complete); // Fetch buffer for rendering
+                {
+                    auto using_gl_context = mir::raii::paired_calls(
+                        [&gl_context] { gl_context->make_current(); },
+                        [&gl_context] { gl_context->release_current(); });
+
+                    mt::ImageRenderer img_renderer{mir_image.pixel_data,
+                                   geom::Size{mir_image.width, mir_image.height},
+                                   mir_image.bytes_per_pixel};
+                    mt::BufferRenderTarget brt{*buffer};
+                    brt.make_current();
+                    img_renderer.render();
+                }
+                s->swap_buffers(buffer, complete); // Post rendered buffer
             }
 
             /*
 
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-10-16 09:24:18 +0000
+++ server-ABI-sha1sums	2014-10-16 14:20:32 +0000
@@ -35,8 +35,8 @@
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
 f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
-b4aaa941df9c0a6f9342629b26542700876f3aaa  include/platform/mir/graphics/native_platform.h
-f47dac961f060eb29a44ed3c8c18a49a3d353bb1  include/platform/mir/graphics/platform.h
+d4ab0ef9544345fcc85740f6ed6d8118728a5c59  include/platform/mir/graphics/native_platform.h
+109d2c82d245a512e7c1790a3b853c9c275ebd4d  include/platform/mir/graphics/platform.h
 1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
 9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
@@ -48,7 +48,7 @@
 a9f284ba4b05d58fd3eeb628d1f56fe4ac188526  include/server/mir/compositor/compositor_id.h
 5205e30c5fdb5b5d8803064fc1abd102db59c4e7  include/server/mir/compositor/scene_element.h
 4fcf34e424128b87ddc76733594e32e09ebbd486  include/server/mir/compositor/scene.h
-afd4ec03c3aadc98b7dbee4e35d1d3bcb9a9334e  include/server/mir/default_server_configuration.h
+e1355c98730be9ba3d25480427f362d322631e88  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 a35c5495d8fd28fc0e375b17495fc5caab51b329  include/server/mir/emergency_cleanup.h
 938de641cb0e01e1098b007b39b151a7dfe4adc1  include/server/mir/frontend/display_changer.h
 
=== removed file 'src/include/platform/mir/graphics/buffer_initializer.h'
--- src/include/platform/mir/graphics/buffer_initializer.h	2014-09-11 05:51:44 +0000
+++ src/include/platform/mir/graphics/buffer_initializer.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_GRAPHICS_BUFFER_INITIALIZER_H_
-#define MIR_GRAPHICS_BUFFER_INITIALIZER_H_
-
-namespace mir
-{
-namespace graphics
-{
-class Buffer;
-
-/**
- * Interface to buffer initialization.
- */
-class BufferInitializer
-{
-public:
-    virtual ~BufferInitializer() {}
-
-    /** Operator to call to initialize a buffer. */
-    virtual void operator()(Buffer& buffer) = 0;
-
-protected:
-    BufferInitializer() = default;
-    BufferInitializer(const BufferInitializer&) = delete;
-    BufferInitializer& operator=(const BufferInitializer&) = delete;
-};
-
-class NullBufferInitializer : public BufferInitializer
-{
-public:
-    void operator()(Buffer& /*buffer*/) {}
-};
-
-}
-}
-
-#endif /* MIR_GRAPHICS_BUFFER_INITIALIZER_H_ */
 
=== modified file 'src/platform/graphics/android/android_buffer_allocator.cpp'
--- src/platform/graphics/android/android_buffer_allocator.cpp	2014-09-19 03:08:20 +0000
+++ src/platform/graphics/android/android_buffer_allocator.cpp	2014-10-16 14:20:32 +0000
@@ -18,7 +18,6 @@
  */
 
 #include "mir/graphics/platform.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/egl_extensions.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir/graphics/android/sync_fence.h"
@@ -46,10 +45,8 @@
 };
 }
 
-mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer)
-    : buffer_initializer(buffer_initializer),
-      egl_extensions(std::make_shared<mg::EGLExtensions>())
+mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator()
+    : egl_extensions(std::make_shared<mg::EGLExtensions>())
 {
     int err;
 
@@ -82,7 +79,7 @@
 {
     auto native_handle = alloc_device->alloc_buffer(sz, pf, use);
     auto buffer = std::make_shared<Buffer>(native_handle, egl_extensions);
-    (*buffer_initializer)(*buffer);
+
     return buffer;
 }
 
 
=== modified file 'src/platform/graphics/android/android_graphic_buffer_allocator.h'
--- src/platform/graphics/android/android_graphic_buffer_allocator.h	2014-03-06 06:05:17 +0000
+++ src/platform/graphics/android/android_graphic_buffer_allocator.h	2014-10-16 14:20:32 +0000
@@ -31,7 +31,6 @@
 namespace graphics
 {
 
-class BufferInitializer;
 class EGLExtensions;
 
 namespace android
@@ -42,8 +41,7 @@
 class AndroidGraphicBufferAllocator: public GraphicBufferAllocator, public graphics::GraphicBufferAllocator
 {
 public:
-    AndroidGraphicBufferAllocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer);
+    AndroidGraphicBufferAllocator();
 
     std::shared_ptr<graphics::Buffer> alloc_buffer(
         graphics::BufferProperties const& buffer_properties);
@@ -58,7 +56,6 @@
 private:
     const hw_module_t    *hw_module;
     std::shared_ptr<GraphicAllocAdaptor> alloc_device;
-    std::shared_ptr<BufferInitializer> const buffer_initializer;
     std::shared_ptr<EGLExtensions> const egl_extensions;
 };
 
 
=== modified file 'src/platform/graphics/android/platform.cpp'
--- src/platform/graphics/android/platform.cpp	2014-09-30 06:11:33 +0000
+++ src/platform/graphics/android/platform.cpp	2014-10-16 14:20:32 +0000
@@ -30,7 +30,6 @@
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/buffer_ipc_message.h"
 #include "mir/graphics/android/native_buffer.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/buffer_id.h"
 #include "mir/graphics/display_report.h"
 #include "mir/options/option.h"
@@ -90,12 +89,11 @@
 {
 }
 
-std::shared_ptr<mg::GraphicBufferAllocator> mga::Platform::create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
+std::shared_ptr<mg::GraphicBufferAllocator> mga::Platform::create_buffer_allocator()
 {
     if (quirks.gralloc_reopenable_after_close())
     {
-        return std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
+        return std::make_shared<mga::AndroidGraphicBufferAllocator>();
     }
     else
     {
@@ -104,15 +102,14 @@
         std::unique_lock<std::mutex> lk(allocator_mutex);
         static std::shared_ptr<mg::GraphicBufferAllocator> preserved_allocator;
         if (!preserved_allocator)
-            preserved_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
+            preserved_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
         return preserved_allocator;
     }
 }
 
-std::shared_ptr<mga::GraphicBufferAllocator> mga::Platform::create_mga_buffer_allocator(
-    std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
+std::shared_ptr<mga::GraphicBufferAllocator> mga::Platform::create_mga_buffer_allocator()
 {
-    return std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
+    return std::make_shared<mga::AndroidGraphicBufferAllocator>();
 }
 
 std::shared_ptr<mg::PlatformIPCPackage> mga::Platform::connection_ipc_package()
@@ -167,9 +164,8 @@
     auto logger = make_logger(*options);
     auto overlay_option = should_use_overlay_optimization(*options);
     logger->log_overlay_optimization(overlay_option);
-    auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
     auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
-    auto fb_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
+    auto fb_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
     auto display_builder = std::make_shared<mga::OutputBuilder>(
         fb_allocator, display_resource_factory, display_report, overlay_option, logger);
     return std::make_shared<mga::Platform>(display_builder, display_report);
 
=== modified file 'src/platform/graphics/android/platform.h'
--- src/platform/graphics/android/platform.h	2014-09-25 09:47:50 +0000
+++ src/platform/graphics/android/platform.h	2014-10-16 14:20:32 +0000
@@ -42,8 +42,7 @@
         std::shared_ptr<DisplayReport> const& display_report);
 
     /* From Platform */
-    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<BufferInitializer> const& buffer_initializer);
+    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator();
     std::shared_ptr<Display> create_display(
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLProgramFactory> const&,
@@ -62,8 +61,7 @@
 
     void initialize(std::shared_ptr<NestedContext> const& nested_context) override;
 
-    std::shared_ptr<GraphicBufferAllocator> create_mga_buffer_allocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer);
+    std::shared_ptr<GraphicBufferAllocator> create_mga_buffer_allocator();
 
     std::shared_ptr<DisplayBuilder> const display_builder;
     std::shared_ptr<DisplayReport> const display_report;
 
=== modified file 'src/platform/graphics/mesa/buffer_allocator.cpp'
--- src/platform/graphics/mesa/buffer_allocator.cpp	2014-09-19 03:08:20 +0000
+++ src/platform/graphics/mesa/buffer_allocator.cpp	2014-10-16 14:20:32 +0000
@@ -23,7 +23,6 @@
 #include "buffer_texture_binder.h"
 #include "anonymous_shm_file.h"
 #include "shm_buffer.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/egl_extensions.h"
 #include "mir/graphics/buffer_properties.h"
 #include <boost/throw_exception.hpp>
@@ -110,15 +109,12 @@
 
 mgm::BufferAllocator::BufferAllocator(
     gbm_device* device,
-    const std::shared_ptr<BufferInitializer>& buffer_initializer,
     BypassOption bypass_option)
     : device(device),
-      buffer_initializer(buffer_initializer),
       egl_extensions(std::make_shared<mg::EGLExtensions>()),
       bypass_option(bypass_option)
 
 {
-    assert(buffer_initializer.get() != 0);
 }
 
 std::shared_ptr<mg::Buffer> mgm::BufferAllocator::alloc_buffer(
@@ -186,8 +182,6 @@
     auto const buffer =
         std::make_shared<GBMBuffer>(bo, bo_flags, std::move(texture_binder));
 
-    (*buffer_initializer)(*buffer);
-
     return buffer;
 }
 
@@ -213,8 +207,6 @@
         std::make_shared<ShmBuffer>(shm_file, buffer_properties.size,
                                     buffer_properties.format);
 
-    (*buffer_initializer)(*buffer);
-
     return buffer;
 }
 
 
=== modified file 'src/platform/graphics/mesa/buffer_allocator.h'
--- src/platform/graphics/mesa/buffer_allocator.h	2014-09-11 05:51:44 +0000
+++ src/platform/graphics/mesa/buffer_allocator.h	2014-10-16 14:20:32 +0000
@@ -34,7 +34,6 @@
 {
 namespace graphics
 {
-class BufferInitializer;
 struct EGLExtensions;
 
 namespace mesa
@@ -42,9 +41,7 @@
 class BufferAllocator: public graphics::GraphicBufferAllocator
 {
 public:
-    BufferAllocator(gbm_device* device,
-                    std::shared_ptr<BufferInitializer> const& buffer_initializer,
-                    BypassOption bypass_option);
+    BufferAllocator(gbm_device* device, BypassOption bypass_option);
 
     virtual std::shared_ptr<Buffer> alloc_buffer(
         graphics::BufferProperties const& buffer_properties);
@@ -59,7 +56,6 @@
         graphics::BufferProperties const& buffer_properties);
 
     gbm_device* const device;
-    std::shared_ptr<graphics::BufferInitializer> buffer_initializer;
     std::shared_ptr<EGLExtensions> const egl_extensions;
 
     BypassOption const bypass_option;
 
=== modified file 'src/platform/graphics/mesa/native_platform.cpp'
--- src/platform/graphics/mesa/native_platform.cpp	2014-09-30 06:11:33 +0000
+++ src/platform/graphics/mesa/native_platform.cpp	2014-10-16 14:20:32 +0000
@@ -53,11 +53,9 @@
     finish_internal_native_display();
 }
 
-std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
+std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator()
 {
-    return std::make_shared<mgm::BufferAllocator>(
-        gbm.device, buffer_initializer, mgm::BypassOption::prohibited);
+    return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited);
 }
 
 std::shared_ptr<mg::PlatformIPCPackage> mgm::NativePlatform::connection_ipc_package()
 
=== modified file 'src/platform/graphics/mesa/native_platform.h'
--- src/platform/graphics/mesa/native_platform.h	2014-09-24 17:01:33 +0000
+++ src/platform/graphics/mesa/native_platform.h	2014-10-16 14:20:32 +0000
@@ -38,8 +38,7 @@
     virtual ~NativePlatform();
 
     void initialize(std::shared_ptr<NestedContext> const& nested_context);
-    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<BufferInitializer> const& buffer_initializer) override;
+    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator() override;
     std::shared_ptr<PlatformIPCPackage> connection_ipc_package() override;
     std::shared_ptr<InternalClient> create_internal_client() override;
     void fill_buffer_package(
 
=== modified file 'src/platform/graphics/mesa/platform.cpp'
--- src/platform/graphics/mesa/platform.cpp	2014-09-30 06:11:33 +0000
+++ src/platform/graphics/mesa/platform.cpp	2014-10-16 14:20:32 +0000
@@ -145,10 +145,9 @@
 }
 
 
-std::shared_ptr<mg::GraphicBufferAllocator> mgm::Platform::create_buffer_allocator(
-        const std::shared_ptr<mg::BufferInitializer>& buffer_initializer)
+std::shared_ptr<mg::GraphicBufferAllocator> mgm::Platform::create_buffer_allocator()
 {
-    return std::make_shared<mgm::BufferAllocator>(gbm.device, buffer_initializer, bypass_option_);
+    return std::make_shared<mgm::BufferAllocator>(gbm.device, bypass_option_);
 }
 
 std::shared_ptr<mg::Display> mgm::Platform::create_display(
 
=== modified file 'src/platform/graphics/mesa/platform.h'
--- src/platform/graphics/mesa/platform.h	2014-09-24 17:01:33 +0000
+++ src/platform/graphics/mesa/platform.h	2014-10-16 14:20:32 +0000
@@ -52,8 +52,7 @@
     ~Platform();
 
     /* From Platform */
-    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<BufferInitializer>& buffer_initializer);
+    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator();
     std::shared_ptr<graphics::BufferWriter> make_buffer_writer();
     std::shared_ptr<graphics::Display> create_display(
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
 
=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2014-09-19 03:08:20 +0000
+++ src/server/graphics/default_configuration.cpp	2014-10-16 14:20:32 +0000
@@ -25,7 +25,6 @@
 #include "nested/nested_platform.h"
 #include "offscreen/display.h"
 
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/gl_config.h"
 #include "mir/graphics/cursor.h"
 #include "program_factory.h"
@@ -43,16 +42,6 @@
 
 namespace mg = mir::graphics;
 
-std::shared_ptr<mg::BufferInitializer>
-mir::DefaultServerConfiguration::the_buffer_initializer()
-{
-    return buffer_initializer(
-        []()
-        {
-             return std::make_shared<mg::NullBufferInitializer>();
-        });
-}
-
 std::shared_ptr<mg::DisplayConfigurationPolicy>
 mir::DefaultServerConfiguration::the_display_configuration_policy()
 {
@@ -102,7 +91,7 @@
     return buffer_allocator(
         [&]()
         {
-            return the_graphics_platform()->create_buffer_allocator(the_buffer_initializer());
+            return the_graphics_platform()->create_buffer_allocator();
         });
 }
 
 
=== modified file 'src/server/graphics/nested/nested_platform.cpp'
--- src/server/graphics/nested/nested_platform.cpp	2014-09-26 05:50:46 +0000
+++ src/server/graphics/nested/nested_platform.cpp	2014-10-16 14:20:32 +0000
@@ -74,10 +74,9 @@
 {
 }
 
-std::shared_ptr<mg::GraphicBufferAllocator> mgn::NestedPlatform::create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
+std::shared_ptr<mg::GraphicBufferAllocator> mgn::NestedPlatform::create_buffer_allocator()
 {
-    return native_platform->create_buffer_allocator(buffer_initializer);
+    return native_platform->create_buffer_allocator();
 }
 
 std::shared_ptr<mg::BufferWriter> mgn::NestedPlatform::make_buffer_writer()
 
=== modified file 'src/server/graphics/nested/nested_platform.h'
--- src/server/graphics/nested/nested_platform.h	2014-09-26 05:50:46 +0000
+++ src/server/graphics/nested/nested_platform.h	2014-10-16 14:20:32 +0000
@@ -42,8 +42,7 @@
         std::shared_ptr<NativePlatform> const& native_platform);
 
     ~NestedPlatform() noexcept;
-    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<BufferInitializer> const& buffer_initializer) override;
+    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator() override;
     std::shared_ptr<Display> create_display(
             std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
             std::shared_ptr<GLProgramFactory> const& gl_program_factory,
 
=== modified file 'tests/acceptance-tests/test_display_configuration.cpp'
--- tests/acceptance-tests/test_display_configuration.cpp	2014-09-11 05:51:44 +0000
+++ tests/acceptance-tests/test_display_configuration.cpp	2014-10-16 14:20:32 +0000
@@ -140,8 +140,7 @@
 class StubPlatform : public mtd::NullPlatform
 {
 public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<mtd::StubBufferAllocator>();
     }
 
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2014-09-30 06:11:33 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2014-10-16 14:20:32 +0000
@@ -121,10 +121,9 @@
 
     void initialize(std::shared_ptr<mg::NestedContext> const& /*nested_context*/) override {}
 
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
-        return adaptee->create_buffer_allocator(buffer_initializer);
+        return adaptee->create_buffer_allocator();
     }
 
     std::shared_ptr<mg::PlatformIPCPackage> connection_ipc_package() override
 
=== removed file 'tests/include/mir_test_doubles/mock_buffer_initializer.h'
--- tests/include/mir_test_doubles/mock_buffer_initializer.h	2013-08-28 03:41:48 +0000
+++ tests/include/mir_test_doubles/mock_buffer_initializer.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_TEST_DOUBLES_MOCK_BUFFER_INITIALIZER_H_
-#define MIR_TEST_DOUBLES_MOCK_BUFFER_INITIALIZER_H_
-
-#include "mir/graphics/buffer_initializer.h"
-
-#include <gmock/gmock.h>
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-class MockBufferInitializer : public graphics::BufferInitializer
-{
-public:
-    MOCK_METHOD1(operator_call, void(graphics::Buffer& buffer));
-
-    void operator()(graphics::Buffer& buffer)
-    {
-        operator_call(buffer);
-    }
-};
-
-}
-}
-} // namespace mir
-
-#endif /* MIR_TEST_DOUBLES_MOCK_BUFFER_INITIALIZER_H_ */
 
=== modified file 'tests/include/mir_test_doubles/null_platform.h'
--- tests/include/mir_test_doubles/null_platform.h	2014-09-24 17:01:33 +0000
+++ tests/include/mir_test_doubles/null_platform.h	2014-10-16 14:20:32 +0000
@@ -33,8 +33,7 @@
 class NullPlatform : public graphics::Platform
 {
  public:
-    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<graphics::BufferInitializer>& /*buffer_initializer*/)
+    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator()
     {
         return nullptr;
     }
 
=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2014-10-14 17:16:30 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2014-10-16 14:20:32 +0000
@@ -19,7 +19,6 @@
 #include "mir_test_framework/process.h"
 
 #include "mir/graphics/buffer_properties.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "src/platform/graphics/android/buffer.h"
 #include "mir/graphics/android/native_buffer.h"
 #include "src/platform/graphics/android/android_graphic_buffer_allocator.h"
@@ -192,8 +191,7 @@
 {
     StubServerGenerator()
     {
-        auto initializer = std::make_shared<mg::NullBufferInitializer>();
-        allocator = std::make_shared<mga::AndroidGraphicBufferAllocator> (initializer);
+        allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
         auto size = geom::Size{test_width, test_height};
         surface_pf = mir_pixel_format_abgr_8888;
         last_posted = allocator->alloc_buffer_platform(size, surface_pf, mga::BufferUsage::use_hardware);
 
=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2014-10-06 03:02:44 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2014-10-16 14:20:32 +0000
@@ -18,7 +18,6 @@
 
 #include "src/platform/graphics/android/android_graphic_buffer_allocator.h"
 #include "src/server/compositor/buffer_queue.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/graphics/android/native_buffer.h"
 #include "mir/graphics/buffer_properties.h"
@@ -47,11 +46,9 @@
         size = geom::Size{334, 122};
         pf  = mir_pixel_format_abgr_8888;
         buffer_properties = mg::BufferProperties{size, pf, mg::BufferUsage::software};
-        null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
         graphics_region_factory = mtd::create_graphics_region_factory();
     }
 
-    std::shared_ptr<mg::BufferInitializer> null_buffer_initializer;
     geom::Size size;
     MirPixelFormat pf;
     mg::BufferProperties buffer_properties;
@@ -89,7 +86,7 @@
 {
     using namespace testing;
 
-    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
+    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
 
     mg::BufferProperties sw_properties{size, pf, mg::BufferUsage::software};
     auto test_buffer = allocator->alloc_buffer(sw_properties);
@@ -106,7 +103,7 @@
     using namespace testing;
 
     mg::BufferProperties hw_properties{size, pf, mg::BufferUsage::hardware};
-    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
+    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
 
     //TODO: kdub it is a bit trickier to test that a gpu can render... just check creation for now
     auto test_buffer = allocator->alloc_buffer(hw_properties);
@@ -117,7 +114,7 @@
 {
     using namespace testing;
 
-    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
+    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
 
     mc::BufferQueue swapper(2, allocator, buffer_properties, policy_factory);
 
 
=== modified file 'tests/integration-tests/graphics/android/test_display_integration.cpp'
--- tests/integration-tests/graphics/android/test_display_integration.cpp	2014-09-25 06:06:57 +0000
+++ tests/integration-tests/graphics/android/test_display_integration.cpp	2014-10-16 14:20:32 +0000
@@ -16,7 +16,6 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/display_buffer.h"
 #include "src/platform/graphics/android/display.h"
 #include "src/platform/graphics/android/hwc_loggers.h"
@@ -55,8 +54,7 @@
            the server can handle this, but we need the test to as well */
         original_sigterm_handler = signal(SIGTERM, [](int){});
 
-        auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-        buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
+        buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
 
         /* note about fb_device: OMAP4 drivers seem to only be able to open fb once
            per process (repeated framebuffer_{open,close}() doesn't seem to work). once we
 
=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2014-09-11 05:51:44 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2014-10-16 14:20:32 +0000
@@ -22,7 +22,6 @@
 #include "src/platform/graphics/android/internal_client.h"
 #include "src/server/compositor/buffer_stream_factory.h"
 #include "src/server/report/null_report_factory.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/graphics/android/mir_native_window.h"
 #include "mir/graphics/platform.h"
@@ -100,8 +99,7 @@
 
     auto stub_input_factory = std::make_shared<StubInputFactory>();
     auto stub_input_sender = std::make_shared<mtd::StubInputSender>();
-    auto null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
+    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>();
     auto buffer_stream_factory = std::make_shared<mc::BufferStreamFactory>(allocator, std::make_shared<mtd::StubFrameDroppingPolicyFactory>());
     auto scene_report = mr::null_scene_report();
     auto const surface_configurator = std::make_shared<mtd::NullSurfaceConfigurator>();
 
=== modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2014-09-11 05:51:44 +0000
+++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2014-10-16 14:20:32 +0000
@@ -19,7 +19,6 @@
 #include "mir/graphics/buffer_basic.h"
 #include "mir/graphics/buffer_id.h"
 #include "mir/graphics/buffer_properties.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/options/configuration.h"
 #include "mir/options/option.h"
 #include "mir_test_doubles/stub_buffer.h"
@@ -85,8 +84,7 @@
 class StubGraphicPlatform : public mtd::NullPlatform
 {
 public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
@@ -116,8 +114,7 @@
             conf_policy,
             std::make_shared<mtd::StubGLProgramFactory>(),
             std::make_shared<mtd::StubGLConfig>());
-        auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-        allocator = platform->create_buffer_allocator(buffer_initializer);
+        allocator = platform->create_buffer_allocator();
         size = geom::Size{100, 100};
         pf = mir_pixel_format_abgr_8888;
         usage = mg::BufferUsage::hardware;
 
=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2014-09-11 05:51:44 +0000
+++ tests/integration-tests/test_display_info.cpp	2014-10-16 14:20:32 +0000
@@ -110,8 +110,7 @@
 class StubPlatform : public mtd::NullPlatform
 {
 public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
 
=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2014-03-06 06:05:17 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2014-10-16 14:20:32 +0000
@@ -47,8 +47,7 @@
 class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
 {
 public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<mtd::StubBufferAllocator>();
     }
 
=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2014-09-11 05:51:44 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2014-10-16 14:20:32 +0000
@@ -181,8 +181,7 @@
     class StubPlatform : public mtd::NullPlatform
     {
     public:
-        std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
+        std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
         {
             return std::make_shared<StubGraphicBufferAllocator>();
         }
 
=== modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
--- tests/mir_test_framework/stubbed_server_configuration.cpp	2014-10-08 12:35:49 +0000
+++ tests/mir_test_framework/stubbed_server_configuration.cpp	2014-10-16 14:20:32 +0000
@@ -184,8 +184,7 @@
     {
     }
 
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2014-10-03 13:04:18 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2014-10-16 14:20:32 +0000
@@ -209,7 +209,7 @@
     MockPlatform(std::shared_ptr<mg::PlatformIpcOperations> const& ipc_ops)
     {
         using namespace testing;
-        ON_CALL(*this, create_buffer_allocator(_))
+        ON_CALL(*this, create_buffer_allocator())
             .WillByDefault(Return(std::shared_ptr<mg::GraphicBufferAllocator>()));
         ON_CALL(*this, create_display(_,_,_))
             .WillByDefault(Return(std::make_shared<mtd::NullDisplay>()));
@@ -219,7 +219,7 @@
             .WillByDefault(Return(ipc_ops));
     }
 
-    MOCK_METHOD1(create_buffer_allocator, std::shared_ptr<mg::GraphicBufferAllocator>(std::shared_ptr<mg::BufferInitializer> const&));
+    MOCK_METHOD0(create_buffer_allocator, std::shared_ptr<mg::GraphicBufferAllocator>());
     MOCK_METHOD3(create_display,
                  std::shared_ptr<mg::Display>(
                      std::shared_ptr<mg::DisplayConfigurationPolicy> const&,
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator_mesa.cpp'
--- tests/unit-tests/frontend/test_session_mediator_mesa.cpp	2014-09-18 07:03:11 +0000
+++ tests/unit-tests/frontend/test_session_mediator_mesa.cpp	2014-10-16 14:20:32 +0000
@@ -54,8 +54,7 @@
 class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
 {
  public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::shared_ptr<mg::GraphicBufferAllocator>();
     }
 
=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2014-10-16 14:20:32 +0000
@@ -18,10 +18,8 @@
 
 #include "src/platform/graphics/android/android_graphic_buffer_allocator.h"
 #include "mir_test_doubles/mock_android_hw.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/buffer_properties.h"
 
-#include "mir_test_doubles/mock_buffer_initializer.h"
 #include "mir_test_doubles/mock_egl.h"
 
 #include <hardware/gralloc.h>
@@ -36,11 +34,9 @@
 struct AndroidGraphicBufferAllocatorTest : public ::testing::Test
 {
     AndroidGraphicBufferAllocatorTest()
-        : null_buffer_initializer{std::make_shared<mg::NullBufferInitializer>()}
     {
     }
 
-    std::shared_ptr<mg::BufferInitializer> const null_buffer_initializer;
     testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock;
     testing::NiceMock<mtd::MockEGL> mock_egl;
 };
@@ -52,12 +48,12 @@
     EXPECT_CALL(hw_access_mock, hw_get_module(StrEq(GRALLOC_HARDWARE_MODULE_ID), _))
         .Times(1);
 
-    mga::AndroidGraphicBufferAllocator allocator(null_buffer_initializer);
+    mga::AndroidGraphicBufferAllocator allocator{};
 }
 
 TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_contain_common_formats)
 {
-    mga::AndroidGraphicBufferAllocator allocator{null_buffer_initializer};
+    mga::AndroidGraphicBufferAllocator allocator{};
     auto supported_pixel_formats = allocator.supported_pixel_formats();
 
     auto abgr_8888_count = std::count(supported_pixel_formats.begin(),
@@ -79,45 +75,13 @@
 
 TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_have_sane_default_in_first_position)
 {
-    mga::AndroidGraphicBufferAllocator allocator{null_buffer_initializer};
+    mga::AndroidGraphicBufferAllocator allocator{};
     auto supported_pixel_formats = allocator.supported_pixel_formats();
 
     ASSERT_FALSE(supported_pixel_formats.empty());
     EXPECT_EQ(mir_pixel_format_abgr_8888, supported_pixel_formats[0]);
 }
 
-TEST_F(AndroidGraphicBufferAllocatorTest, alloc_buffer_calls_initializer)
-{
-    using namespace testing;
-
-    auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>();
-
-    mg::BufferProperties properties{geom::Size{2, 2},
-                                    mir_pixel_format_abgr_8888,
-                                    mg::BufferUsage::hardware};
-    mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
-    EXPECT_CALL(*buffer_initializer, operator_call(_))
-        .Times(1);
-
-    allocator.alloc_buffer(properties);
-}
-
-TEST_F(AndroidGraphicBufferAllocatorTest, alloc_buffer_platform_calls_initializer)
-{
-    using namespace testing;
-
-    auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>();
-
-    mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
-    auto size = geom::Size{2, 2};
-    auto pf = mir_pixel_format_abgr_8888;
-
-    EXPECT_CALL(*buffer_initializer, operator_call(_))
-        .Times(1);
-
-    allocator.alloc_buffer_platform(size, pf, mga::BufferUsage::use_hardware);
-}
-
 TEST_F(AndroidGraphicBufferAllocatorTest, buffer_usage_converter)
 {
     EXPECT_EQ(mga::BufferUsage::use_hardware,
 
=== modified file 'tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp'
--- tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp	2014-09-11 05:51:44 +0000
+++ tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp	2014-10-16 14:20:32 +0000
@@ -25,7 +25,6 @@
 #include "mir_test_doubles/mock_gbm.h"
 #include "mir_test_doubles/mock_egl.h"
 #include "mir_test_doubles/mock_gl.h"
-#include "mir_test_doubles/mock_buffer_initializer.h"
 #include "mir_test_doubles/platform_factory.h"
 #include "mir_test_framework/udev_environment.h"
 
@@ -62,9 +61,8 @@
         .WillByDefault(Return(mock_gbm.fake_gbm.bo_handle));
 
         platform = mtd::create_mesa_platform_with_null_dependencies();
-        mock_buffer_initializer = std::make_shared<testing::NiceMock<mtd::MockBufferInitializer>>();
         allocator.reset(new mgm::BufferAllocator(
-            platform->gbm.device, mock_buffer_initializer, mgm::BypassOption::allowed));
+            platform->gbm.device, mgm::BypassOption::allowed));
     }
 
     // Defaults
@@ -78,7 +76,6 @@
     ::testing::NiceMock<mtd::MockEGL> mock_egl;
     ::testing::NiceMock<mtd::MockGL> mock_gl;
     std::shared_ptr<mgm::Platform> platform;
-    std::shared_ptr<testing::NiceMock<mtd::MockBufferInitializer>> mock_buffer_initializer;
     std::unique_ptr<mgm::BufferAllocator> allocator;
     mtf::UdevEnvironment fake_devices;
 };
@@ -147,7 +144,6 @@
 
     mgm::BufferAllocator alloc(
         platform->gbm.device,
-        mock_buffer_initializer,
         mgm::BypassOption::prohibited);
     auto buf = alloc.alloc_buffer(properties);
     ASSERT_TRUE(buf.get() != NULL);
@@ -236,29 +232,6 @@
     allocator->alloc_buffer(buffer_properties);
 }
 
-TEST_F(MesaBufferAllocatorTest, buffer_initializer_is_called)
-{
-    using namespace testing;
-
-    EXPECT_CALL(*mock_buffer_initializer, operator_call(_))
-        .Times(1);
-
-    allocator->alloc_buffer(buffer_properties);
-}
-
-TEST_F(MesaBufferAllocatorTest, null_buffer_initializer_does_not_crash)
-{
-    using namespace testing;
-
-    auto null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-    allocator.reset(new mgm::BufferAllocator(
-        platform->gbm.device, null_buffer_initializer, mgm::BypassOption::allowed));
-
-    EXPECT_NO_THROW({
-        allocator->alloc_buffer(buffer_properties);
-    });
-}
-
 TEST_F(MesaBufferAllocatorTest, throws_on_buffer_creation_failure)
 {
     using namespace testing;
 
=== modified file 'tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp	2014-09-19 03:08:20 +0000
+++ tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp	2014-10-16 14:20:32 +0000
@@ -25,7 +25,6 @@
 
 #include "src/platform/graphics/mesa/gbm_buffer.h"
 #include "src/platform/graphics/mesa/buffer_allocator.h"
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir_test_doubles/platform_factory.h"
 
@@ -71,9 +70,8 @@
         .WillByDefault(Return(stride.as_uint32_t()));
 
         platform = mtd::create_mesa_platform_with_null_dependencies();
-        null_init = std::make_shared<mg::NullBufferInitializer>();
 
-        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, null_init, mgm::BypassOption::allowed));
+        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, mgm::BypassOption::allowed));
     }
 
     ::testing::NiceMock<mtd::MockDRM> mock_drm;
@@ -81,7 +79,6 @@
     ::testing::NiceMock<mtd::MockEGL> mock_egl;
     ::testing::NiceMock<mtd::MockGL>  mock_gl;
     std::shared_ptr<mgm::Platform> platform;
-    std::shared_ptr<mg::NullBufferInitializer> null_init;
     std::unique_ptr<mgm::BufferAllocator> allocator;
 
     // Defaults
 
=== modified file 'tests/unit-tests/graphics/nested/test_nested_platform.cpp'
--- tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-09-24 17:01:33 +0000
+++ tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-10-16 14:20:32 +0000
@@ -49,8 +49,7 @@
 public:
     void initialize(std::shared_ptr<mg::NestedContext> const&) override {}
 
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
-        std::shared_ptr<mg::BufferInitializer> const&) override
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return {};
     }
 
=== modified file 'tests/unit-tests/graphics/test_graphics_platform.cpp'
--- tests/unit-tests/graphics/test_graphics_platform.cpp	2014-09-23 19:01:02 +0000
+++ tests/unit-tests/graphics/test_graphics_platform.cpp	2014-10-16 14:20:32 +0000
@@ -31,7 +31,6 @@
 #else
 #include "mir_test_doubles/mock_android_hw.h"
 #endif
-#include "mir/graphics/buffer_initializer.h"
 #include "mir/logging/dumb_console_logger.h"
 
 
@@ -52,7 +51,6 @@
     GraphicsPlatform() : logger(std::make_shared<ml::DumbConsoleLogger>())
     {
         using namespace testing;
-        buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
 
 #ifndef ANDROID
         ON_CALL(mock_gbm, gbm_bo_get_width(_))
@@ -74,7 +72,6 @@
     }
 
     std::shared_ptr<ml::Logger> logger;
-    std::shared_ptr<mg::BufferInitializer> buffer_initializer;
 
     ::testing::NiceMock<mtd::MockEGL> mock_egl;
     ::testing::NiceMock<mtd::MockGL> mock_gl;
@@ -93,7 +90,7 @@
 
     EXPECT_NO_THROW (
         auto platform = create_platform();
-        auto allocator = platform->create_buffer_allocator(buffer_initializer);
+        auto allocator = platform->create_buffer_allocator();
 
         EXPECT_TRUE(allocator.get());
     );
@@ -103,7 +100,7 @@
 TEST_F(GraphicsPlatform, buffer_creation)
 {
     auto platform = create_platform();
-    auto allocator = platform->create_buffer_allocator(buffer_initializer);
+    auto allocator = platform->create_buffer_allocator();
     auto supported_pixel_formats = allocator->supported_pixel_formats();
 
     ASSERT_NE(0u, supported_pixel_formats.size());