Merge lp:~vanvugt/mir/one-PixelFormat-type into lp:mir

[Daniel van Vugt]

Unify redundant PixelFormat typedefs into one: MirPixelFormat (LP: #1110115)

It's not a high priority change, but it had to happen eventually. And being a clear ABI+API break, we should do it ASAP.

[Alan Griffiths (alan-griffiths)]

ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1263
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/187/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/458/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/319/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/93/console

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Needs resync with development-branch.

[Daniel van Vugt (vanvugt)]

Fixed. Try again.

[Robert Carr (robertcarr)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/198/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/358/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/100
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/101
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/101/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1264
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/492/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/362/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/218
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/221
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/221/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/492/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-11-25 07:59:56 +0000
+++ debian/control	2013-12-02 16:56:54 +0000
@@ -69,7 +69,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver11
+Package: libmirserver12
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -115,7 +115,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver11 (= ${binary:Version}),
+Depends: libmirserver12 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver11.install' => 'debian/libmirserver12.install'
--- debian/libmirserver11.install	2013-11-25 07:59:56 +0000
+++ debian/libmirserver12.install	2013-12-02 16:56:54 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.11
+usr/lib/*/libmirserver.so.12

=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-11-25 07:59:56 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-12-02 16:56:54 +0000
@@ -92,7 +92,7 @@
     auto params = msh::a_surface().of_name("Inprocess EGL Demo")
         .of_size(surface_size)
         .of_buffer_usage(mg::BufferUsage::hardware)
-        .of_pixel_format(geom::PixelFormat::argb_8888);
+        .of_pixel_format(mir_pixel_format_argb_8888);
     auto session = shell->open_session("Inprocess client", std::make_shared<NullEventSink>());
     // TODO: Why do we get an ID? ~racarr
     auto surface = session->get_surface(shell->create_surface_for(session, params));

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2013-11-26 08:39:00 +0000
+++ examples/eglapp.c	2013-12-02 16:56:54 +0000
@@ -129,23 +129,6 @@
     }
 }
 
-static unsigned int get_bpp(MirPixelFormat pf)
-{
-    switch (pf)
-    {
-        case mir_pixel_format_abgr_8888:
-        case mir_pixel_format_xbgr_8888:
-        case mir_pixel_format_argb_8888:
-        case mir_pixel_format_xrgb_8888:
-            return 32;
-        case mir_pixel_format_bgr_888:
-            return 24;
-        case mir_pixel_format_invalid:
-        default:
-            return 0;
-    }
-}
-
 static const MirDisplayOutput *find_active_output(
     const MirDisplayConfiguration *conf)
 {
@@ -357,7 +340,7 @@
 
     printf("Server supports %d of %d surface pixel formats. Using format: %d\n",
         nformats, mir_pixel_formats, surfaceparm.pixel_format);
-    unsigned int bpp = get_bpp(surfaceparm.pixel_format);
+    unsigned int bpp = 8 * MIR_BYTES_PER_PIXEL(surfaceparm.pixel_format);
     EGLint attribs[] =
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,

=== modified file 'include/platform/mir/graphics/buffer.h'
--- include/platform/mir/graphics/buffer.h	2013-10-15 08:53:10 +0000
+++ include/platform/mir/graphics/buffer.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/native_buffer.h"
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <memory>
 
@@ -40,7 +40,7 @@
     virtual BufferID id() const = 0;
     virtual geometry::Size size() const = 0;
     virtual geometry::Stride stride() const = 0;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
     virtual void bind_to_texture() = 0;
     virtual bool can_bypass() const = 0;
 

=== modified file 'include/platform/mir/graphics/buffer_properties.h'
--- include/platform/mir/graphics/buffer_properties.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/buffer_properties.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #define MIR_GRAPHICS_BUFFER_PROPERTIES_H_
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 namespace mir
 {
@@ -49,13 +49,13 @@
 {
     BufferProperties() :
         size(),
-        format(geometry::PixelFormat::invalid),
+        format(mir_pixel_format_invalid),
         usage(BufferUsage::undefined)
     {
     }
 
     BufferProperties(const geometry::Size& size,
-                     const geometry::PixelFormat& format,
+                     const MirPixelFormat& format,
                      BufferUsage usage) :
         size{size},
         format{format},
@@ -64,7 +64,7 @@
     }
 
     geometry::Size size;
-    geometry::PixelFormat format;
+    MirPixelFormat format;
     BufferUsage usage;
 };
 

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2013-09-12 21:36:55 +0000
+++ include/platform/mir/graphics/display_configuration.h	2013-12-02 16:56:54 +0000
@@ -22,7 +22,6 @@
 #include "mir/int_wrapper.h"
 #include "mir/geometry/size.h"
 #include "mir/geometry/point.h"
-#include "mir/geometry/pixel_format.h"
 #include "mir_toolkit/common.h"
 
 #include <functional>
@@ -89,7 +88,7 @@
     /** The type of the output. */
     DisplayConfigurationOutputType type;
     /** The pixel formats supported by the output */
-    std::vector<geometry::PixelFormat> pixel_formats;
+    std::vector<MirPixelFormat> pixel_formats;
     /** The modes supported by the output. */
     std::vector<DisplayConfigurationMode> modes;
     /** The index in the 'modes' vector of the preferred output mode. */

=== modified file 'include/platform/mir/graphics/graphic_buffer_allocator.h'
--- include/platform/mir/graphics/graphic_buffer_allocator.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/graphic_buffer_allocator.h	2013-12-02 16:56:54 +0000
@@ -50,7 +50,7 @@
     /**
      * The supported buffer pixel formats.
      */
-    virtual std::vector<geometry::PixelFormat> supported_pixel_formats() = 0;
+    virtual std::vector<MirPixelFormat> supported_pixel_formats() = 0;
 
 protected:
     GraphicBufferAllocator() = default;

=== modified file 'include/server/mir/compositor/buffer_stream.h'
--- include/server/mir/compositor/buffer_stream.h	2013-11-27 12:28:24 +0000
+++ include/server/mir/compositor/buffer_stream.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 #define MIR_COMPOSITOR_BUFFER_STREAM_H_
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/graphics/buffer_id.h"
 
 #include <memory>
@@ -46,7 +46,7 @@
     virtual std::shared_ptr<graphics::Buffer>
         lock_compositor_buffer(unsigned long frameno) = 0;
     virtual std::shared_ptr<graphics::Buffer> lock_snapshot_buffer() = 0;
-    virtual geometry::PixelFormat get_stream_pixel_format() = 0;
+    virtual MirPixelFormat get_stream_pixel_format() = 0;
     virtual geometry::Size stream_size() = 0;
     virtual void resize(geometry::Size const& size) = 0;
     virtual void allow_framedropping(bool) = 0;

=== modified file 'include/server/mir/frontend/surface.h'
--- include/server/mir/frontend/surface.h	2013-11-27 12:28:24 +0000
+++ include/server/mir/frontend/surface.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,6 @@
 #ifndef MIR_FRONTEND_SURFACE_H_
 #define MIR_FRONTEND_SURFACE_H_
 
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/size.h"
 #include "mir_toolkit/common.h"
@@ -55,7 +54,7 @@
     virtual void force_requests_to_complete() = 0;
 
     virtual geometry::Size size() const = 0;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
 
     virtual void swap_buffers(std::shared_ptr<graphics::Buffer>&) = 0;
 

=== modified file 'include/server/mir/shell/surface_creation_parameters.h'
--- include/server/mir/shell/surface_creation_parameters.h	2013-11-27 12:28:24 +0000
+++ include/server/mir/shell/surface_creation_parameters.h	2013-12-02 16:56:54 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
 #define MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/size.h"
 #include "mir/graphics/buffer_properties.h"
@@ -49,7 +49,7 @@
 
     SurfaceCreationParameters& of_buffer_usage(graphics::BufferUsage new_buffer_usage);
 
-    SurfaceCreationParameters& of_pixel_format(geometry::PixelFormat new_pixel_format);
+    SurfaceCreationParameters& of_pixel_format(MirPixelFormat new_pixel_format);
 
     SurfaceCreationParameters& of_depth(scene::DepthId const& new_depth);
 
@@ -61,7 +61,7 @@
     geometry::Size size;
     geometry::Point top_left;
     graphics::BufferUsage buffer_usage;
-    geometry::PixelFormat pixel_format;
+    MirPixelFormat pixel_format;
     scene::DepthId depth;
     input::InputReceptionMode input_mode;
     graphics::DisplayConfigurationOutputId output_id;

=== removed file 'include/shared/mir/geometry/pixel_format.h'
--- include/shared/mir/geometry/pixel_format.h	2013-10-07 08:25:04 +0000
+++ include/shared/mir/geometry/pixel_format.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: Alan Griffiths <[e-mail]>
- */
-
-
-#ifndef MIR_COMPOSITOR_PIXEL_FORMAT_H_
-#define MIR_COMPOSITOR_PIXEL_FORMAT_H_
-
-#include <cstdint>
-#include <cstddef>
-
-namespace mir
-{
-namespace geometry
-{
-enum class PixelFormat : uint32_t
-{
-    invalid,
-    abgr_8888,
-    xbgr_8888,
-    argb_8888,
-    xrgb_8888,
-    bgr_888
-};
-
-static inline size_t bytes_per_pixel(PixelFormat fmt)
-{
-    return (fmt == PixelFormat::bgr_888) ? 3 : 4;
-}
-
-static inline bool has_alpha(PixelFormat fmt)
-{
-    return (fmt == PixelFormat::abgr_8888) ||
-           (fmt == PixelFormat::argb_8888);
-}
-
-}
-}
-
-#endif /* MIR_COMPOSITOR_PIXEL_FORMAT_H_ */

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2013-11-27 12:28:24 +0000
+++ include/shared/mir_toolkit/client_types.h	2013-12-02 16:56:54 +0000
@@ -103,26 +103,6 @@
     MirConnection* connection, void* context);
 
 /**
- * The order of components in a format enum matches the
- * order of the components as they would be written in an
- *  integer representing a pixel value of that format.
- *
- * For example, abgr_8888 corresponds to 0xAABBGGRR, which will
- * end up as R,G,B,A in memory in a little endian system, and
- * as A,B,G,R in memory in a big endian system.
- */
-typedef enum MirPixelFormat
-{
-    mir_pixel_format_invalid,
-    mir_pixel_format_abgr_8888,
-    mir_pixel_format_xbgr_8888,
-    mir_pixel_format_argb_8888,
-    mir_pixel_format_xrgb_8888,
-    mir_pixel_format_bgr_888,
-    mir_pixel_formats
-} MirPixelFormat;
-
-/**
  * MirBufferUsage specifies how a surface can and will be used. A "hardware"
  * surface can be used for OpenGL accelerated rendering. A "software" surface
  * is one that can be addressed in main memory and blitted to directly.

=== modified file 'include/shared/mir_toolkit/common.h'
--- include/shared/mir_toolkit/common.h	2013-11-26 08:10:57 +0000
+++ include/shared/mir_toolkit/common.h	2013-12-02 16:56:54 +0000
@@ -86,6 +86,30 @@
     mir_power_mode_suspend, /* Blanked, lowest power. */
     mir_power_mode_off /* Powered down. */
 } MirPowerMode;
+
+/**
+ * The order of components in a format enum matches the
+ * order of the components as they would be written in an
+ *  integer representing a pixel value of that format.
+ *
+ * For example, abgr_8888 corresponds to 0xAABBGGRR, which will
+ * end up as R,G,B,A in memory in a little endian system, and
+ * as A,B,G,R in memory in a big endian system.
+ */
+typedef enum MirPixelFormat
+{
+    mir_pixel_format_invalid,
+    mir_pixel_format_abgr_8888,
+    mir_pixel_format_xbgr_8888,
+    mir_pixel_format_argb_8888,
+    mir_pixel_format_xrgb_8888,
+    mir_pixel_format_bgr_888,
+    mir_pixel_formats
+} MirPixelFormat;
+
+/* This could be improved... https://bugs.launchpad.net/mir/+bug/1236254 */
+#define MIR_BYTES_PER_PIXEL(f) (((f) == mir_pixel_format_bgr_888) ? 3 : 4)
+
 /**@}*/
 
 #endif

=== modified file 'include/test/mir_test/draw/draw_pattern_checkered-inl.h'
--- include/test/mir_test/draw/draw_pattern_checkered-inl.h	2013-11-27 12:28:24 +0000
+++ include/test/mir_test/draw/draw_pattern_checkered-inl.h	2013-12-02 16:56:54 +0000
@@ -16,8 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/geometry/pixel_format.h"
-namespace geom = mir::geometry;
+#include "mir_toolkit/common.h"
 
 template<size_t Rows, size_t Cols>
 DrawPatternCheckered<Rows,Cols>::DrawPatternCheckered(uint32_t (&pattern) [Rows][Cols])
@@ -32,7 +31,7 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888)
         throw(std::runtime_error("cannot draw region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(int i=0; i < region.width; i++)
     {
         for(int j=0; j<region.height; j++)
@@ -51,7 +50,7 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888)
         throw(std::runtime_error("cannot check region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(int i=0; i< region.width; i++)
     {
         for(int j=0; j<region.height; j++)

=== modified file 'include/test/mir_test_doubles/mock_alloc_adaptor.h'
--- include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-11-28 14:17:01 +0000
+++ include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-12-02 16:56:54 +0000
@@ -35,7 +35,7 @@
 {
 public:
     MOCK_METHOD3(alloc_buffer,
-        std::shared_ptr<graphics::NativeBuffer>(geometry::Size, geometry::PixelFormat, graphics::android::BufferUsage));
+        std::shared_ptr<graphics::NativeBuffer>(geometry::Size, MirPixelFormat, graphics::android::BufferUsage));
 };
 
 }

=== modified file 'include/test/mir_test_doubles/mock_buffer.h'
--- include/test/mir_test_doubles/mock_buffer.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/mock_buffer.h	2013-12-02 16:56:54 +0000
@@ -42,7 +42,7 @@
 
     MockBuffer(geometry::Size size,
                geometry::Stride s,
-               geometry::PixelFormat pf)
+               MirPixelFormat pf)
     {
         using namespace testing;
         ON_CALL(*this, size())
@@ -60,7 +60,7 @@
 
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(stride, geometry::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
     MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<graphics::NativeBuffer>());
 
     MOCK_METHOD0(bind_to_texture, void());

=== modified file 'include/test/mir_test_doubles/mock_buffer_stream.h'
--- include/test/mir_test_doubles/mock_buffer_stream.h	2013-11-27 12:28:24 +0000
+++ include/test/mir_test_doubles/mock_buffer_stream.h	2013-12-02 16:56:54 +0000
@@ -37,7 +37,7 @@
                  std::shared_ptr<graphics::Buffer>(unsigned long));
     MOCK_METHOD0(lock_snapshot_buffer, std::shared_ptr<graphics::Buffer>());
 
-    MOCK_METHOD0(get_stream_pixel_format, geometry::PixelFormat());
+    MOCK_METHOD0(get_stream_pixel_format, MirPixelFormat());
     MOCK_METHOD0(stream_size, geometry::Size());
     MOCK_METHOD1(resize, void(geometry::Size const&));
     MOCK_METHOD0(force_client_completion, void());

=== modified file 'include/test/mir_test_doubles/mock_framebuffer_bundle.h'
--- include/test/mir_test_doubles/mock_framebuffer_bundle.h	2013-11-28 14:17:01 +0000
+++ include/test/mir_test_doubles/mock_framebuffer_bundle.h	2013-12-02 16:56:54 +0000
@@ -38,7 +38,7 @@
         ON_CALL(*this, last_rendered_buffer())
             .WillByDefault(Return(std::make_shared<StubBuffer>()));
     }
-    MOCK_METHOD0(fb_format, geometry::PixelFormat());
+    MOCK_METHOD0(fb_format, MirPixelFormat());
     MOCK_METHOD0(fb_size, geometry::Size());
     MOCK_METHOD0(buffer_for_render, std::shared_ptr<graphics::Buffer>());
     MOCK_METHOD0(last_rendered_buffer, std::shared_ptr<graphics::Buffer>());

=== modified file 'include/test/mir_test_doubles/mock_frontend_surface.h'
--- include/test/mir_test_doubles/mock_frontend_surface.h	2013-11-27 12:28:24 +0000
+++ include/test/mir_test_doubles/mock_frontend_surface.h	2013-12-02 16:56:54 +0000
@@ -42,7 +42,7 @@
     MOCK_METHOD1(swap_buffers, void(std::shared_ptr<graphics::Buffer>&));
 
     MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(supports_input, bool());
     MOCK_CONST_METHOD0(client_input_fd, int());

=== modified file 'include/test/mir_test_doubles/mock_surface.h'
--- include/test/mir_test_doubles/mock_surface.h	2013-11-25 07:59:56 +0000
+++ include/test/mir_test_doubles/mock_surface.h	2013-12-02 16:56:54 +0000
@@ -56,7 +56,7 @@
 
     MOCK_CONST_METHOD0(name, std::string());
     MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(supports_input, bool());
     MOCK_CONST_METHOD0(client_input_fd, int());

=== modified file 'include/test/mir_test_doubles/stub_buffer.h'
--- include/test/mir_test_doubles/stub_buffer.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/stub_buffer.h	2013-12-02 16:56:54 +0000
@@ -40,7 +40,7 @@
 public:
     StubBuffer()
         : buf_size{0, 0},
-          buf_pixel_format{geometry::PixelFormat::abgr_8888}
+          buf_pixel_format{mir_pixel_format_abgr_8888}
     {
     }
 
@@ -54,7 +54,7 @@
 
     virtual geometry::Stride stride() const { return geometry::Stride(); }
 
-    virtual geometry::PixelFormat pixel_format() const { return buf_pixel_format; }
+    virtual MirPixelFormat pixel_format() const { return buf_pixel_format; }
 
     virtual std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const
     {
@@ -69,7 +69,7 @@
     virtual bool can_bypass() const override { return false; }
 
     geometry::Size const buf_size;
-    geometry::PixelFormat const buf_pixel_format;
+    MirPixelFormat const buf_pixel_format;
 };
 }
 }

=== modified file 'include/test/mir_test_doubles/stub_buffer_allocator.h'
--- include/test/mir_test_doubles/stub_buffer_allocator.h	2013-11-25 07:59:56 +0000
+++ include/test/mir_test_doubles/stub_buffer_allocator.h	2013-12-02 16:56:54 +0000
@@ -43,7 +43,7 @@
         return std::make_shared<StubBuffer>(properties);
     }
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats()
+    std::vector<MirPixelFormat> supported_pixel_formats()
     {
         return {};
     }

=== modified file 'include/test/mir_test_doubles/stub_buffer_stream.h'
--- include/test/mir_test_doubles/stub_buffer_stream.h	2013-11-27 12:28:24 +0000
+++ include/test/mir_test_doubles/stub_buffer_stream.h	2013-12-02 16:56:54 +0000
@@ -55,9 +55,9 @@
         return stub_compositor_buffer;
     }
 
-    geometry::PixelFormat get_stream_pixel_format() override
+    MirPixelFormat get_stream_pixel_format() override
     {
-        return geometry::PixelFormat();
+        return MirPixelFormat();
     }
 
     geometry::Size stream_size() override

=== modified file 'include/test/mir_test_doubles/stub_display_builder.h'
--- include/test/mir_test_doubles/stub_display_builder.h	2013-11-28 14:17:01 +0000
+++ include/test/mir_test_doubles/stub_display_builder.h	2013-12-02 16:56:54 +0000
@@ -52,9 +52,9 @@
     {
     }
 
-    geometry::PixelFormat display_format()
+    MirPixelFormat display_format()
     {
-        return geometry::PixelFormat::abgr_8888;
+        return mir_pixel_format_abgr_8888;
     }
 
     std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(

=== modified file 'include/test/mir_test_doubles/stub_display_configuration.h'
--- include/test/mir_test_doubles/stub_display_configuration.h	2013-11-27 12:28:24 +0000
+++ include/test/mir_test_doubles/stub_display_configuration.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/display_configuration.h"
 #include "mir/geometry/rectangle.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <vector>
 
@@ -43,15 +43,15 @@
     StubDisplayConfig(unsigned int num_displays)
         : StubDisplayConfig(num_displays,
                             {
-                                geometry::PixelFormat::bgr_888,
-                                geometry::PixelFormat::abgr_8888,
-                                geometry::PixelFormat::xbgr_8888
+                                mir_pixel_format_bgr_888,
+                                mir_pixel_format_abgr_8888,
+                                mir_pixel_format_xbgr_8888
                             })
     {
     }
 
     StubDisplayConfig(unsigned int num_displays,
-                      std::vector<geometry::PixelFormat> const& pfs)
+                      std::vector<MirPixelFormat> const& pfs)
     {
         /* construct a non-trivial dummy display config to send */
         int mode_index = 0;
@@ -105,7 +105,7 @@
                 graphics::DisplayConfigurationOutputId{id},
                 graphics::DisplayConfigurationCardId{0},
                 graphics::DisplayConfigurationOutputType::vga,
-                std::vector<geometry::PixelFormat>{geometry::PixelFormat::abgr_8888},
+                std::vector<MirPixelFormat>{mir_pixel_format_abgr_8888},
                 {{rect.size, 60.0}},
                 0, geometry::Size{}, true, true, rect.top_left, 0, 0, mir_power_mode_on
             };

=== modified file 'src/client/android/android_client_buffer.cpp'
--- src/client/android/android_client_buffer.cpp	2013-11-25 07:59:56 +0000
+++ src/client/android/android_client_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -29,7 +29,7 @@
 
 mcla::AndroidClientBuffer::AndroidClientBuffer(std::shared_ptr<AndroidRegistrar> const& registrar,
                                                std::shared_ptr<const native_handle_t> const& handle,
-                                               geom::Size size, geom::PixelFormat pf, geometry::Stride stride)
+                                               geom::Size size, MirPixelFormat pf, geometry::Stride stride)
  : buffer_registrar(registrar),
    native_handle(handle),
    buffer_pf(pf), buffer_stride{stride}, buffer_size(size)
@@ -48,7 +48,7 @@
     //note: mir uses stride in bytes, ANativeWindowBuffer needs it in pixel units. some drivers care
     //about byte-stride, they will pass stride via ANativeWindowBuffer::handle (which is opaque to us)
     anwb->stride = stride.as_uint32_t() /
-                                   geom::bytes_per_pixel(buffer_pf);
+                                   MIR_BYTES_PER_PIXEL(buffer_pf);
     anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
     anwb->handle = native_handle.get();
 
@@ -82,7 +82,7 @@
     return buffer_stride;
 }
 
-geom::PixelFormat mcla::AndroidClientBuffer::pixel_format() const
+MirPixelFormat mcla::AndroidClientBuffer::pixel_format() const
 {
     return buffer_pf;
 }

=== modified file 'src/client/android/android_client_buffer.h'
--- src/client/android/android_client_buffer.h	2013-11-25 07:59:56 +0000
+++ src/client/android/android_client_buffer.h	2013-12-02 16:56:54 +0000
@@ -39,13 +39,13 @@
 public:
     AndroidClientBuffer(std::shared_ptr<AndroidRegistrar> const&,
                         std::shared_ptr<const native_handle_t> const&,
-                        geometry::Size size, geometry::PixelFormat pf, geometry::Stride stride);
+                        geometry::Size size, MirPixelFormat pf, geometry::Stride stride);
     ~AndroidClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const;
 
     AndroidClientBuffer(const AndroidClientBuffer&) = delete;
@@ -56,7 +56,7 @@
     std::shared_ptr<AndroidRegistrar> buffer_registrar;
     std::shared_ptr<graphics::android::AndroidNativeBuffer> native_window_buffer;
     std::shared_ptr<const native_handle_t> native_handle;
-    const geometry::PixelFormat buffer_pf;
+    const MirPixelFormat buffer_pf;
     geometry::Stride const buffer_stride;
     geometry::Size const buffer_size;
 };

=== modified file 'src/client/android/android_client_buffer_factory.cpp'
--- src/client/android/android_client_buffer_factory.cpp	2013-11-25 07:59:56 +0000
+++ src/client/android/android_client_buffer_factory.cpp	2013-12-02 16:56:54 +0000
@@ -29,7 +29,7 @@
 {
 }
 
-std::shared_ptr<mcl::ClientBuffer> mcla::AndroidClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geom::Size size, geom::PixelFormat pf)
+std::shared_ptr<mcl::ClientBuffer> mcla::AndroidClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geom::Size size, MirPixelFormat pf)
 {
     (void)size; // TODO: remove this unused parameter
     auto handle = registrar->register_buffer(package);

=== modified file 'src/client/android/android_client_buffer_factory.h'
--- src/client/android/android_client_buffer_factory.h	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_buffer_factory.h	2013-12-02 16:56:54 +0000
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 #include "../client_buffer_factory.h"
@@ -44,7 +44,7 @@
     explicit AndroidClientBufferFactory(std::shared_ptr<AndroidRegistrar> const&);
 
     virtual std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                        geometry::Size size, geometry::PixelFormat pf);
+                                                        geometry::Size size, MirPixelFormat pf);
 private:
     std::shared_ptr<AndroidRegistrar> registrar;
 };

=== modified file 'src/client/android/android_registrar_gralloc.h'
--- src/client/android/android_registrar_gralloc.h	2013-06-21 23:24:37 +0000
+++ src/client/android/android_registrar_gralloc.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_CLIENT_ANDROID_ANDROID_REGISTRAR_GRALLOC_H_
 #define MIR_CLIENT_ANDROID_ANDROID_REGISTRAR_GRALLOC_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "android_registrar.h"
 #include <hardware/gralloc.h>
 

=== modified file 'src/client/client_buffer.h'
--- src/client/client_buffer.h	2013-11-26 13:09:31 +0000
+++ src/client/client_buffer.h	2013-12-02 16:56:54 +0000
@@ -22,7 +22,6 @@
 
 #include "mir/graphics/native_buffer.h"
 #include "mir_toolkit/common.h"
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/size.h"
 
 #include <memory>
@@ -46,7 +45,7 @@
     geometry::Width width;
     geometry::Height height;
     geometry::Stride stride;
-    geometry::PixelFormat format;
+    MirPixelFormat format;
     std::shared_ptr<char> vaddr;
 };
 
@@ -58,7 +57,7 @@
     virtual std::shared_ptr<MemoryRegion> secure_for_cpu_write() = 0;
     virtual geometry::Size size() const = 0;
     virtual geometry::Stride stride() const = 0;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
     virtual uint32_t age() const = 0;
     virtual void increment_age() = 0;
     virtual void mark_as_submitted() = 0;

=== modified file 'src/client/client_buffer_depository.cpp'
--- src/client/client_buffer_depository.cpp	2013-08-28 03:41:48 +0000
+++ src/client/client_buffer_depository.cpp	2013-12-02 16:56:54 +0000
@@ -33,7 +33,7 @@
 {
 }
 
-void mcl::ClientBufferDepository::deposit_package(std::shared_ptr<MirBufferPackage> const& package, int id, geometry::Size size, geometry::PixelFormat pf)
+void mcl::ClientBufferDepository::deposit_package(std::shared_ptr<MirBufferPackage> const& package, int id, geometry::Size size, MirPixelFormat pf)
 {
     auto existing_buffer_id_pair = buffers.end();
     for (auto pair = buffers.begin(); pair != buffers.end(); ++pair)

=== modified file 'src/client/client_buffer_depository.h'
--- src/client/client_buffer_depository.h	2013-08-28 03:41:48 +0000
+++ src/client/client_buffer_depository.h	2013-12-02 16:56:54 +0000
@@ -23,7 +23,7 @@
 #include <list>
 #include <memory>
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 namespace mir
@@ -59,7 +59,7 @@
     /// This also marks the previous current buffer (if any) as being submitted to the server.
     /// \post current_buffer() will return a ClientBuffer constructed from this IPC data.
     void deposit_package(std::shared_ptr<MirBufferPackage> const&, int id,
-                         geometry::Size, geometry::PixelFormat);
+                         geometry::Size, MirPixelFormat);
     std::shared_ptr<ClientBuffer> current_buffer();
     uint32_t current_buffer_id() const;
 

=== modified file 'src/client/client_buffer_factory.h'
--- src/client/client_buffer_factory.h	2013-06-17 09:51:42 +0000
+++ src/client/client_buffer_factory.h	2013-12-02 16:56:54 +0000
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 namespace mir
@@ -46,7 +46,7 @@
      * \param [in] pf the buffer's pixel format
      */
     virtual std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                        geometry::Size size, geometry::PixelFormat pf) = 0;
+                                                        geometry::Size size, MirPixelFormat pf) = 0;
 
 protected:
     ClientBufferFactory() = default;

=== modified file 'src/client/gbm/gbm_client_buffer.cpp'
--- src/client/gbm/gbm_client_buffer.cpp	2013-11-27 15:25:10 +0000
+++ src/client/gbm/gbm_client_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -44,7 +44,7 @@
 {
     ShmMemoryRegion(std::shared_ptr<mclg::BufferFileOps> const& buffer_file_ops,
                     int buffer_fd, geom::Size const& size_param,
-                    geom::Stride stride_param, geom::PixelFormat format_param)
+                    geom::Stride stride_param, MirPixelFormat format_param)
         : buffer_file_ops{buffer_file_ops},
           size_in_bytes{size_param.height.as_uint32_t() * stride_param.as_uint32_t()}
     {
@@ -80,7 +80,7 @@
 mclg::GBMClientBuffer::GBMClientBuffer(
     std::shared_ptr<mclg::BufferFileOps> const& buffer_file_ops,
     std::shared_ptr<MirBufferPackage> const& package,
-    geom::Size size, geom::PixelFormat pf)
+    geom::Size size, MirPixelFormat pf)
     : buffer_file_ops{buffer_file_ops},
       creation_package{package},
       rect({geom::Point{0, 0}, size}),
@@ -116,7 +116,7 @@
     return geom::Stride{creation_package->stride};
 }
 
-geom::PixelFormat mclg::GBMClientBuffer::pixel_format() const
+MirPixelFormat mclg::GBMClientBuffer::pixel_format() const
 {
     return buffer_pf;
 }

=== modified file 'src/client/gbm/gbm_client_buffer.h'
--- src/client/gbm/gbm_client_buffer.h	2013-11-27 15:25:10 +0000
+++ src/client/gbm/gbm_client_buffer.h	2013-12-02 16:56:54 +0000
@@ -41,21 +41,21 @@
     GBMClientBuffer(std::shared_ptr<BufferFileOps> const& buffer_file_ops,
                     std::shared_ptr<MirBufferPackage> const& buffer_package,
                     geometry::Size size,
-                    geometry::PixelFormat pf);
+                    MirPixelFormat pf);
 
     ~GBMClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 
 private:
     std::shared_ptr<BufferFileOps> const buffer_file_ops;
     std::shared_ptr<MirBufferPackage> const creation_package;
     geometry::Rectangle const rect;
-    geometry::PixelFormat const buffer_pf;
+    MirPixelFormat const buffer_pf;
 };
 
 }

=== modified file 'src/client/gbm/gbm_client_buffer_factory.cpp'
--- src/client/gbm/gbm_client_buffer_factory.cpp	2013-11-27 15:25:10 +0000
+++ src/client/gbm/gbm_client_buffer_factory.cpp	2013-12-02 16:56:54 +0000
@@ -29,7 +29,7 @@
 {
 }
 
-std::shared_ptr<mcl::ClientBuffer> mclg::GBMClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geometry::Size size, geometry::PixelFormat pf)
+std::shared_ptr<mcl::ClientBuffer> mclg::GBMClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geometry::Size size, MirPixelFormat pf)
 {
     (void)size; // TODO: remove this unused parameter
     return std::make_shared<mclg::GBMClientBuffer>(

=== modified file 'src/client/gbm/gbm_client_buffer_factory.h'
--- src/client/gbm/gbm_client_buffer_factory.h	2013-11-26 13:09:31 +0000
+++ src/client/gbm/gbm_client_buffer_factory.h	2013-12-02 16:56:54 +0000
@@ -40,7 +40,7 @@
     explicit GBMClientBufferFactory(std::shared_ptr<BufferFileOps> const& buffer_file_ops);
 
     std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                geometry::Size size, geometry::PixelFormat pf);
+                                                geometry::Size size, MirPixelFormat pf);
 private:
     std::shared_ptr<BufferFileOps> const buffer_file_ops;
 };

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2013-11-27 12:28:24 +0000
+++ src/client/mir_surface.cpp	2013-12-02 16:56:54 +0000
@@ -159,10 +159,10 @@
 }
 
 /* todo: all these conversion functions are a bit of a kludge, probably
-         better to have a more developed geometry::PixelFormat that can handle this */
-geom::PixelFormat MirSurface::convert_ipc_pf_to_geometry(gp::int32 pf)
+         better to have a more developed MirPixelFormat that can handle this */
+MirPixelFormat MirSurface::convert_ipc_pf_to_geometry(gp::int32 pf)
 {
-    return static_cast<geom::PixelFormat>(pf);
+    return static_cast<MirPixelFormat>(pf);
 }
 
 void MirSurface::process_incoming_buffer()

=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2013-11-25 07:59:56 +0000
+++ src/client/mir_surface.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,6 @@
 
 #include "mir_protobuf.pb.h"
 
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/dimensions.h"
 #include "mir_toolkit/mir_client_library.h"
 #include "mir_toolkit/common.h"
@@ -101,7 +100,7 @@
     void populate(MirBufferPackage& buffer_package);
     void created(mir_surface_callback callback, void * context);
     void new_buffer(mir_surface_callback callback, void * context);
-    mir::geometry::PixelFormat convert_ipc_pf_to_geometry(google::protobuf::int32 pf);
+    MirPixelFormat convert_ipc_pf_to_geometry(google::protobuf::int32 pf);
 
     /* todo: race condition. protobuf does not guarantee that callbacks will be synchronized. potential
              race in surface, last_buffer_id */

=== modified file 'src/platform/graphics/android/android_alloc_adaptor.cpp'
--- src/platform/graphics/android/android_alloc_adaptor.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_alloc_adaptor.cpp	2013-12-02 16:56:54 +0000
@@ -52,7 +52,7 @@
 }
 
 std::shared_ptr<mg::NativeBuffer> mga::AndroidAllocAdaptor::alloc_buffer(
-    geometry::Size size, geometry::PixelFormat pf, BufferUsage usage)
+    geometry::Size size, MirPixelFormat pf, BufferUsage usage)
 {
     buffer_handle_t buf_handle = NULL;
     auto stride = 0;

=== modified file 'src/platform/graphics/android/android_alloc_adaptor.h'
--- src/platform/graphics/android/android_alloc_adaptor.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_alloc_adaptor.h	2013-12-02 16:56:54 +0000
@@ -36,7 +36,7 @@
 public:
     explicit AndroidAllocAdaptor(const std::shared_ptr<struct alloc_device_t>& alloc_device);
     std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size,
-            geometry::PixelFormat, BufferUsage usage);
+            MirPixelFormat, BufferUsage usage);
 
     /* note: alloc_device_t has a third method (dump) that isn't needed by us. it can be used to check buffer contents */
 

=== modified file 'src/platform/graphics/android/android_buffer_allocator.cpp'
--- src/platform/graphics/android/android_buffer_allocator.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_buffer_allocator.cpp	2013-12-02 16:56:54 +0000
@@ -78,7 +78,7 @@
 }
 
 std::shared_ptr<mg::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer_platform(
-    geom::Size sz, geom::PixelFormat pf, mga::BufferUsage use)
+    geom::Size sz, MirPixelFormat pf, mga::BufferUsage use)
 {
     auto native_handle = alloc_device->alloc_buffer(sz, pf, use);
     auto buffer = std::make_shared<Buffer>(native_handle, egl_extensions);
@@ -86,12 +86,12 @@
     return buffer;
 }
 
-std::vector<geom::PixelFormat> mga::AndroidGraphicBufferAllocator::supported_pixel_formats()
+std::vector<MirPixelFormat> mga::AndroidGraphicBufferAllocator::supported_pixel_formats()
 {
-    static std::vector<geom::PixelFormat> const pixel_formats{
-        geom::PixelFormat::abgr_8888,
-        geom::PixelFormat::xbgr_8888,
-        geom::PixelFormat::bgr_888
+    static std::vector<MirPixelFormat> const pixel_formats{
+        mir_pixel_format_abgr_8888,
+        mir_pixel_format_xbgr_8888,
+        mir_pixel_format_bgr_888
     };
 
     return pixel_formats;

=== modified file 'src/platform/graphics/android/android_display_configuration.cpp'
--- src/platform/graphics/android/android_display_configuration.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_display_configuration.cpp	2013-12-02 16:56:54 +0000
@@ -24,7 +24,7 @@
         : configuration{mg::DisplayConfigurationOutputId{1},
                         mg::DisplayConfigurationCardId{0},
                         mg::DisplayConfigurationOutputType::lvds,
-                        {geom::PixelFormat::abgr_8888},
+                        {mir_pixel_format_abgr_8888},
                         {mg::DisplayConfigurationMode{display_size,0.0f}},
                         0,
                         geom::Size{0,0},

=== modified file 'src/platform/graphics/android/android_format_conversion-inl.h'
--- src/platform/graphics/android/android_format_conversion-inl.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_format_conversion-inl.h	2013-12-02 16:56:54 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 #define MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <system/graphics.h>
 
 namespace mir
@@ -29,39 +29,39 @@
 namespace android
 {
 
-inline static int to_android_format(geometry::PixelFormat format)
+inline static int to_android_format(MirPixelFormat format)
 {
     switch(format)
     {
-        case geometry::PixelFormat::abgr_8888:
+        case mir_pixel_format_abgr_8888:
             return HAL_PIXEL_FORMAT_RGBA_8888;
-        case geometry::PixelFormat::xbgr_8888:
+        case mir_pixel_format_xbgr_8888:
             return HAL_PIXEL_FORMAT_RGBX_8888;
-        case geometry::PixelFormat::argb_8888:
-            return HAL_PIXEL_FORMAT_BGRA_8888;
-        case geometry::PixelFormat::xrgb_8888:
-            return HAL_PIXEL_FORMAT_BGRA_8888;
-        case geometry::PixelFormat::bgr_888:
+        case mir_pixel_format_argb_8888:
+            return HAL_PIXEL_FORMAT_BGRA_8888;
+        case mir_pixel_format_xrgb_8888:
+            return HAL_PIXEL_FORMAT_BGRA_8888;
+        case mir_pixel_format_bgr_888:
             return HAL_PIXEL_FORMAT_RGB_888;
         default:
             return 0;
     }
 }
 
-inline static mir::geometry::PixelFormat to_mir_format(int format)
+inline static MirPixelFormat to_mir_format(int format)
 {
     switch(format)
     {
         case HAL_PIXEL_FORMAT_RGBA_8888:
-            return geometry::PixelFormat::abgr_8888;
+            return mir_pixel_format_abgr_8888;
         case HAL_PIXEL_FORMAT_RGBX_8888:
-            return geometry::PixelFormat::xbgr_8888;
+            return mir_pixel_format_xbgr_8888;
         case HAL_PIXEL_FORMAT_BGRA_8888:
-            return geometry::PixelFormat::argb_8888;
+            return mir_pixel_format_argb_8888;
         case HAL_PIXEL_FORMAT_RGB_888:
-            return geometry::PixelFormat::bgr_888;
+            return mir_pixel_format_bgr_888;
         default:
-            return geometry::PixelFormat::invalid;
+            return mir_pixel_format_invalid;
     }
 }
 

=== modified file 'src/platform/graphics/android/android_graphic_buffer_allocator.h'
--- src/platform/graphics/android/android_graphic_buffer_allocator.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/android_graphic_buffer_allocator.h	2013-12-02 16:56:54 +0000
@@ -49,9 +49,9 @@
         graphics::BufferProperties const& buffer_properties);
 
     std::shared_ptr<graphics::Buffer> alloc_buffer_platform(
-        geometry::Size sz, geometry::PixelFormat pf, BufferUsage use);
+        geometry::Size sz, MirPixelFormat pf, BufferUsage use);
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats();
+    std::vector<MirPixelFormat> supported_pixel_formats();
 
     static BufferUsage convert_from_compositor_usage(graphics::BufferUsage usage);
 

=== modified file 'src/platform/graphics/android/buffer.cpp'
--- src/platform/graphics/android/buffer.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/buffer.cpp	2013-12-02 16:56:54 +0000
@@ -60,10 +60,10 @@
 {
     ANativeWindowBuffer *anwb = native_buffer->anwb();
     return geom::Stride{anwb->stride *
-                        geom::bytes_per_pixel(pixel_format())};
+                        MIR_BYTES_PER_PIXEL(pixel_format())};
 }
 
-geom::PixelFormat mga::Buffer::pixel_format() const
+MirPixelFormat mga::Buffer::pixel_format() const
 {
     ANativeWindowBuffer *anwb = native_buffer->anwb();
     return mga::to_mir_format(anwb->format);

=== modified file 'src/platform/graphics/android/buffer.h'
--- src/platform/graphics/android/buffer.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/buffer.h	2013-12-02 16:56:54 +0000
@@ -49,7 +49,7 @@
 
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     void bind_to_texture();
     bool can_bypass() const override;
 

=== modified file 'src/platform/graphics/android/display_builder.h'
--- src/platform/graphics/android/display_builder.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/display_builder.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_DISPLAY_BUILDER_H_
 
 #include "mir/graphics/display_buffer.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <memory>
 
 namespace mir
@@ -37,7 +37,7 @@
 public:
     virtual ~DisplayBuilder() = default;
 
-    virtual geometry::PixelFormat display_format() = 0;
+    virtual MirPixelFormat display_format() = 0;
     virtual std::shared_ptr<DisplayDevice> create_display_device() = 0;
     virtual std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
         std::shared_ptr<DisplayDevice> const& display_device,

=== modified file 'src/platform/graphics/android/framebuffer_bundle.h'
--- src/platform/graphics/android/framebuffer_bundle.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/framebuffer_bundle.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_FRAMEBUFFER_BUNDLE_H_
 #define MIR_GRAPHICS_ANDROID_FRAMEBUFFER_BUNDLE_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 #include <memory>
 
@@ -37,7 +37,7 @@
 public:
     virtual ~FramebufferBundle() = default;
 
-    virtual geometry::PixelFormat fb_format() = 0;
+    virtual MirPixelFormat fb_format() = 0;
     virtual geometry::Size fb_size() = 0;
     virtual std::shared_ptr<Buffer> buffer_for_render() = 0;
     virtual std::shared_ptr<Buffer> last_rendered_buffer() = 0;

=== modified file 'src/platform/graphics/android/framebuffers.cpp'
--- src/platform/graphics/android/framebuffers.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/framebuffers.cpp	2013-12-02 16:56:54 +0000
@@ -33,7 +33,7 @@
 
 namespace
 {
-geom::PixelFormat determine_hwc11_fb_format()
+MirPixelFormat determine_hwc11_fb_format()
 {
     static EGLint const fb_egl_config_attr [] =
     {
@@ -50,7 +50,7 @@
     eglInitialize(egl_display, &major, &minor);
     eglChooseConfig(egl_display, fb_egl_config_attr, &fb_egl_config, 1, &matching_configs);
 
-    geom::PixelFormat fb_format;
+    MirPixelFormat fb_format;
     if (matching_configs)
     {
         int visual_id;
@@ -61,7 +61,7 @@
     {
         //we couldn't figure out the fb format via egl. In this case, we
         //assume abgr_8888. HWC api really should provide this information directly.
-        fb_format = geom::PixelFormat::abgr_8888;
+        fb_format = mir_pixel_format_abgr_8888;
     }
 
     eglTerminate(egl_display);
@@ -117,7 +117,7 @@
     }
 }
 
-geom::PixelFormat mga::Framebuffers::fb_format()
+MirPixelFormat mga::Framebuffers::fb_format()
 {
     return format;
 }

=== modified file 'src/platform/graphics/android/framebuffers.h'
--- src/platform/graphics/android/framebuffers.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/framebuffers.h	2013-12-02 16:56:54 +0000
@@ -46,14 +46,14 @@
     Framebuffers(std::shared_ptr<GraphicBufferAllocator> const& buffer_allocator,
                  std::shared_ptr<framebuffer_device_t> const& fb);
 
-    geometry::PixelFormat fb_format();
+    MirPixelFormat fb_format();
     geometry::Size fb_size();
     std::shared_ptr<Buffer> buffer_for_render();
     std::shared_ptr<Buffer> last_rendered_buffer();
     void wait_for_consumed_buffer(bool);
 
 private:
-    geometry::PixelFormat const format;
+    MirPixelFormat const format;
     geometry::Size const size;
 
     std::mutex queue_lock;

=== modified file 'src/platform/graphics/android/gl_context.cpp'
--- src/platform/graphics/android/gl_context.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/gl_context.cpp	2013-12-02 16:56:54 +0000
@@ -26,7 +26,6 @@
 
 namespace mg=mir::graphics;
 namespace mga=mir::graphics::android;
-namespace geom=mir::geometry;
 
 namespace
 {
@@ -69,7 +68,7 @@
 
 /* the minimum requirement is to have EGL_WINDOW_BIT and EGL_OPENGL_ES2_BIT, and to select a config
    whose pixel format matches that of the framebuffer. */
-static EGLConfig select_egl_config_with_format(EGLDisplay egl_display, geom::PixelFormat display_format)
+static EGLConfig select_egl_config_with_format(EGLDisplay egl_display, MirPixelFormat display_format)
 {
     int required_visual_id = mga::to_android_format(display_format);
     int num_potential_configs;
@@ -107,7 +106,7 @@
     return eglCreateWindowSurface(disp, config, native, NULL);
 }
 
-mga::GLContext::GLContext(geom::PixelFormat display_format, mg::DisplayReport& report)
+mga::GLContext::GLContext(MirPixelFormat display_format, mg::DisplayReport& report)
     : egl_display(create_and_initialize_display()),
       own_display(true),
       egl_config(select_egl_config_with_format(egl_display, display_format)),

=== modified file 'src/platform/graphics/android/gl_context.h'
--- src/platform/graphics/android/gl_context.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/gl_context.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/gl_context.h"
 #include "mir/graphics/egl_resources.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <functional>
 
 namespace mir
@@ -40,7 +40,7 @@
 {
 public:
     //For creating a gl context
-    GLContext(geometry::PixelFormat display_format, DisplayReport& report);
+    GLContext(MirPixelFormat display_format, DisplayReport& report);
 
     //For creating a gl context shared with another GLContext
     GLContext(GLContext const& shared_gl_context,

=== modified file 'src/platform/graphics/android/graphic_alloc_adaptor.h'
--- src/platform/graphics/android/graphic_alloc_adaptor.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/graphic_alloc_adaptor.h	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_GRAPHIC_ALLOC_ADAPTOR_H_
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "buffer_usage.h"
 #include <memory>
 
@@ -37,7 +37,7 @@
 {
 public:
     virtual std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size size,
-        geometry::PixelFormat, BufferUsage usage) = 0;
+        MirPixelFormat, BufferUsage usage) = 0;
 protected:
     GraphicAllocAdaptor() = default;
     virtual ~GraphicAllocAdaptor() {}

=== modified file 'src/platform/graphics/android/graphic_buffer_allocator.h'
--- src/platform/graphics/android/graphic_buffer_allocator.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/graphic_buffer_allocator.h	2013-12-02 16:56:54 +0000
@@ -23,7 +23,7 @@
 #include "buffer_usage.h"
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <memory>
 
@@ -39,7 +39,7 @@
 {
 public:
     virtual std::shared_ptr<graphics::Buffer> alloc_buffer_platform(
-        geometry::Size sz, geometry::PixelFormat pf, BufferUsage use) = 0;
+        geometry::Size sz, MirPixelFormat pf, BufferUsage use) = 0;
 
 protected:
     GraphicBufferAllocator() = default;

=== modified file 'src/platform/graphics/android/hwc11_device.h'
--- src/platform/graphics/android/hwc11_device.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/hwc11_device.h	2013-12-02 16:56:54 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_HWC11_DEVICE_H_
 #define MIR_GRAPHICS_ANDROID_HWC11_DEVICE_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "hwc_common_device.h"
 #include "hwc_layerlist.h"
 #include <memory>
@@ -52,7 +52,7 @@
     std::shared_ptr<SyncFence> last_display_fence;
     std::shared_ptr<SyncFileOps> const sync_ops;
     unsigned int primary_display_config;
-    geometry::PixelFormat fb_format;
+    MirPixelFormat fb_format;
 };
 
 }

=== modified file 'src/platform/graphics/android/internal_client_window.cpp'
--- src/platform/graphics/android/internal_client_window.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/internal_client_window.cpp	2013-12-02 16:56:54 +0000
@@ -35,7 +35,7 @@
     : surface(surface),
       resource_cache(cache)
 {
-    format = mga::to_android_format(geometry::PixelFormat(surface->pixel_format()));
+    format = mga::to_android_format(MirPixelFormat(surface->pixel_format()));
 }
 
 mg::NativeBuffer* mga::InternalClientWindow::driver_requests_buffer()

=== modified file 'src/platform/graphics/android/internal_client_window.h'
--- src/platform/graphics/android/internal_client_window.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/internal_client_window.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/android/android_driver_interpreter.h"
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <memory>
 
 namespace mir

=== modified file 'src/platform/graphics/android/output_builder.cpp'
--- src/platform/graphics/android/output_builder.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/output_builder.cpp	2013-12-02 16:56:54 +0000
@@ -68,7 +68,7 @@
     }
 }
 
-geom::PixelFormat mga::OutputBuilder::display_format()
+MirPixelFormat mga::OutputBuilder::display_format()
 {
     return framebuffers->fb_format();
 }

=== modified file 'src/platform/graphics/android/output_builder.h'
--- src/platform/graphics/android/output_builder.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/output_builder.h	2013-12-02 16:56:54 +0000
@@ -43,7 +43,7 @@
         std::shared_ptr<DisplayReport> const& display_report,
         bool should_use_fb_fallback);
 
-    geometry::PixelFormat display_format();
+    MirPixelFormat display_format();
     std::shared_ptr<DisplayDevice> create_display_device();
     std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
         std::shared_ptr<DisplayDevice> const& display_device,

=== modified file 'src/platform/graphics/android/server_render_window.h'
--- src/platform/graphics/android/server_render_window.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/android/server_render_window.h	2013-12-02 16:56:54 +0000
@@ -21,7 +21,7 @@
 #define MIR_GRAPHICS_ANDROID_SERVER_RENDER_WINDOW_H_
 
 #include "mir/graphics/android/android_driver_interpreter.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <memory>
 

=== modified file 'src/platform/graphics/gbm/buffer_allocator.cpp'
--- src/platform/graphics/gbm/buffer_allocator.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/buffer_allocator.cpp	2013-12-02 16:56:54 +0000
@@ -202,7 +202,7 @@
     }
 
     auto const stride = geom::Stride{
-        geom::bytes_per_pixel(buffer_properties.format) *
+        MIR_BYTES_PER_PIXEL(buffer_properties.format) *
         buffer_properties.size.width.as_uint32_t()};
     size_t const size_in_bytes = 
         stride.as_int() * buffer_properties.size.height.as_int();
@@ -218,17 +218,17 @@
     return buffer;
 }
 
-std::vector<geom::PixelFormat> mgg::BufferAllocator::supported_pixel_formats()
+std::vector<MirPixelFormat> mgg::BufferAllocator::supported_pixel_formats()
 {
-    static std::vector<geom::PixelFormat> const pixel_formats{
-        geom::PixelFormat::argb_8888,
-        geom::PixelFormat::xrgb_8888
+    static std::vector<MirPixelFormat> const pixel_formats{
+        mir_pixel_format_argb_8888,
+        mir_pixel_format_xrgb_8888
     };
 
     return pixel_formats;
 }
 
-bool mgg::BufferAllocator::is_pixel_format_supported(geom::PixelFormat format)
+bool mgg::BufferAllocator::is_pixel_format_supported(MirPixelFormat format)
 {
     auto formats = supported_pixel_formats();
 

=== modified file 'src/platform/graphics/gbm/buffer_allocator.h'
--- src/platform/graphics/gbm/buffer_allocator.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/buffer_allocator.h	2013-12-02 16:56:54 +0000
@@ -47,10 +47,10 @@
     virtual std::shared_ptr<Buffer> alloc_buffer(
         graphics::BufferProperties const& buffer_properties);
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats();
+    std::vector<MirPixelFormat> supported_pixel_formats();
 
 private:
-    bool is_pixel_format_supported(geometry::PixelFormat format);
+    bool is_pixel_format_supported(MirPixelFormat format);
     std::shared_ptr<Buffer> alloc_hardware_buffer(
         graphics::BufferProperties const& buffer_properties);
     std::shared_ptr<Buffer> alloc_software_buffer(

=== modified file 'src/platform/graphics/gbm/gbm_buffer.cpp'
--- src/platform/graphics/gbm/gbm_buffer.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/gbm_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -32,38 +32,38 @@
 namespace mgg=mir::graphics::gbm;
 namespace geom=mir::geometry;
 
-geom::PixelFormat mgg::gbm_format_to_mir_format(uint32_t format)
+MirPixelFormat mgg::gbm_format_to_mir_format(uint32_t format)
 {
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
 
     switch (format)
     {
     case GBM_BO_FORMAT_ARGB8888:
     case GBM_FORMAT_ARGB8888:
-        pf = geom::PixelFormat::argb_8888;
+        pf = mir_pixel_format_argb_8888;
         break;
     case GBM_BO_FORMAT_XRGB8888:
     case GBM_FORMAT_XRGB8888:
-        pf = geom::PixelFormat::xrgb_8888;
+        pf = mir_pixel_format_xrgb_8888;
         break;
     default:
-        pf = geom::PixelFormat::invalid;
+        pf = mir_pixel_format_invalid;
         break;
     }
 
     return pf;
 }
 
-uint32_t mgg::mir_format_to_gbm_format(geom::PixelFormat format)
+uint32_t mgg::mir_format_to_gbm_format(MirPixelFormat format)
 {
     uint32_t gbm_pf;
 
     switch (format)
     {
-    case geom::PixelFormat::argb_8888:
+    case mir_pixel_format_argb_8888:
         gbm_pf = GBM_FORMAT_ARGB8888;
         break;
-    case geom::PixelFormat::xrgb_8888:
+    case mir_pixel_format_xrgb_8888:
         gbm_pf = GBM_FORMAT_XRGB8888;
         break;
     default:
@@ -113,7 +113,7 @@
     return geom::Stride(gbm_bo_get_stride(gbm_handle.get()));
 }
 
-geom::PixelFormat mgg::GBMBuffer::pixel_format() const
+MirPixelFormat mgg::GBMBuffer::pixel_format() const
 {
     return gbm_format_to_mir_format(gbm_bo_get_format(gbm_handle.get()));
 }

=== modified file 'src/platform/graphics/gbm/gbm_buffer.h'
--- src/platform/graphics/gbm/gbm_buffer.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/gbm_buffer.h	2013-12-02 16:56:54 +0000
@@ -39,8 +39,8 @@
     struct gbm_bo *bo;
 };
 
-geometry::PixelFormat gbm_format_to_mir_format(uint32_t format);
-uint32_t mir_format_to_gbm_format(geometry::PixelFormat format);
+MirPixelFormat gbm_format_to_mir_format(uint32_t format);
+uint32_t mir_format_to_gbm_format(MirPixelFormat format);
 enum : uint32_t { invalid_gbm_format = std::numeric_limits<uint32_t>::max() };
 
 class BufferTextureBinder;
@@ -60,7 +60,7 @@
 
     virtual geometry::Stride stride() const;
 
-    virtual geometry::PixelFormat pixel_format() const;
+    virtual MirPixelFormat pixel_format() const;
 
     virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 

=== modified file 'src/platform/graphics/gbm/real_kms_display_configuration.cpp'
--- src/platform/graphics/gbm/real_kms_display_configuration.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/real_kms_display_configuration.cpp	2013-12-02 16:56:54 +0000
@@ -185,8 +185,8 @@
     size_t current_mode_index{std::numeric_limits<size_t>::max()};
     size_t preferred_mode_index{std::numeric_limits<size_t>::max()};
     std::vector<DisplayConfigurationMode> modes;
-    std::vector<geom::PixelFormat> formats {geom::PixelFormat::argb_8888,
-                                            geom::PixelFormat::xrgb_8888};
+    std::vector<MirPixelFormat> formats {mir_pixel_format_argb_8888,
+                                         mir_pixel_format_xrgb_8888};
 
     drmModeModeInfo current_mode_info = drmModeModeInfo();
 

=== modified file 'src/platform/graphics/gbm/shm_buffer.cpp'
--- src/platform/graphics/gbm/shm_buffer.cpp	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/shm_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -29,11 +29,11 @@
 mgg::ShmBuffer::ShmBuffer(
     std::shared_ptr<ShmFile> const& shm_file,
     geom::Size const& size,
-    geom::PixelFormat const& pixel_format)
+    MirPixelFormat const& pixel_format)
     : shm_file{shm_file},
       size_{size},
       pixel_format_{pixel_format},
-      stride_{geom::bytes_per_pixel(pixel_format_) * size_.width.as_uint32_t()},
+      stride_{MIR_BYTES_PER_PIXEL(pixel_format_) * size_.width.as_uint32_t()},
       pixels{shm_file->base_ptr()}
 {
 }
@@ -52,7 +52,7 @@
     return stride_;
 }
 
-geom::PixelFormat mgg::ShmBuffer::pixel_format() const
+MirPixelFormat mgg::ShmBuffer::pixel_format() const
 {
     return pixel_format_;
 }

=== modified file 'src/platform/graphics/gbm/shm_buffer.h'
--- src/platform/graphics/gbm/shm_buffer.h	2013-11-28 14:02:22 +0000
+++ src/platform/graphics/gbm/shm_buffer.h	2013-12-02 16:56:54 +0000
@@ -23,7 +23,7 @@
 #include "mir/graphics/buffer_basic.h"
 #include "mir/geometry/dimensions.h"
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 namespace mir
 {
@@ -39,12 +39,12 @@
 public:
     ShmBuffer(std::shared_ptr<ShmFile> const& shm_file,
               geometry::Size const& size,
-              geometry::PixelFormat const& pixel_format);
+              MirPixelFormat const& pixel_format);
     ~ShmBuffer() noexcept;
 
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
     void bind_to_texture();
     bool can_bypass() const;
@@ -55,7 +55,7 @@
 
     std::shared_ptr<ShmFile> const shm_file;
     geometry::Size const size_;
-    geometry::PixelFormat const pixel_format_;
+    MirPixelFormat const pixel_format_;
     geometry::Stride const stride_;
     void* const pixels;
 };

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-11-25 07:59:56 +0000
+++ src/server/CMakeLists.txt	2013-12-02 16:56:54 +0000
@@ -92,7 +92,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 11)
+set(MIRSERVER_ABI 12)
 
 set_target_properties(
   mirserver

=== modified file 'src/server/compositor/buffer_stream_surfaces.cpp'
--- src/server/compositor/buffer_stream_surfaces.cpp	2013-11-27 12:28:24 +0000
+++ src/server/compositor/buffer_stream_surfaces.cpp	2013-12-02 16:56:54 +0000
@@ -64,7 +64,7 @@
     }
 }
 
-geom::PixelFormat mc::BufferStreamSurfaces::get_stream_pixel_format()
+MirPixelFormat mc::BufferStreamSurfaces::get_stream_pixel_format()
 {
     return buffer_bundle->properties().format;
 }

=== modified file 'src/server/compositor/buffer_stream_surfaces.h'
--- src/server/compositor/buffer_stream_surfaces.h	2013-11-27 12:28:24 +0000
+++ src/server/compositor/buffer_stream_surfaces.h	2013-12-02 16:56:54 +0000
@@ -46,7 +46,7 @@
         lock_compositor_buffer(unsigned long frameno) override;
     std::shared_ptr<graphics::Buffer> lock_snapshot_buffer() override;
 
-    geometry::PixelFormat get_stream_pixel_format() override;
+    MirPixelFormat get_stream_pixel_format() override;
     geometry::Size stream_size() override;
     void resize(geometry::Size const& size) override;
     void allow_framedropping(bool) override;

=== modified file 'src/server/compositor/temporary_buffers.cpp'
--- src/server/compositor/temporary_buffers.cpp	2013-11-27 12:28:24 +0000
+++ src/server/compositor/temporary_buffers.cpp	2013-12-02 16:56:54 +0000
@@ -62,7 +62,7 @@
     return buffer->stride();
 }
 
-geom::PixelFormat mc::TemporaryBuffer::pixel_format() const
+MirPixelFormat mc::TemporaryBuffer::pixel_format() const
 {
     return buffer->pixel_format();
 }

=== modified file 'src/server/compositor/temporary_buffers.h'
--- src/server/compositor/temporary_buffers.h	2013-11-27 12:28:24 +0000
+++ src/server/compositor/temporary_buffers.h	2013-12-02 16:56:54 +0000
@@ -37,7 +37,7 @@
 public:
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     mg::BufferID id() const;
     void bind_to_texture();
     std::shared_ptr<mg::NativeBuffer> native_buffer_handle() const;

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2013-11-27 12:28:24 +0000
+++ src/server/frontend/session_mediator.cpp	2013-12-02 16:56:54 +0000
@@ -57,7 +57,7 @@
     std::shared_ptr<frontend::Shell> const& shell,
     std::shared_ptr<graphics::Platform> const & graphics_platform,
     std::shared_ptr<mf::DisplayChanger> const& display_changer,
-    std::vector<geom::PixelFormat> const& surface_pixel_formats,
+    std::vector<MirPixelFormat> const& surface_pixel_formats,
     std::shared_ptr<SessionMediatorReport> const& report,
     std::shared_ptr<EventSink> const& sender,
     std::shared_ptr<ResourceCache> const& resource_cache) :
@@ -155,7 +155,7 @@
             .of_name(request->surface_name())
             .of_size(request->width(), request->height())
             .of_buffer_usage(static_cast<graphics::BufferUsage>(request->buffer_usage()))
-            .of_pixel_format(static_cast<geometry::PixelFormat>(request->pixel_format()))
+            .of_pixel_format(static_cast<MirPixelFormat>(request->pixel_format()))
             .with_output_id(graphics::DisplayConfigurationOutputId(request->output_id())));
 
         auto surface = session->get_surface(surf_id);

=== modified file 'src/server/frontend/session_mediator.h'
--- src/server/frontend/session_mediator.h	2013-11-25 07:59:56 +0000
+++ src/server/frontend/session_mediator.h	2013-12-02 16:56:54 +0000
@@ -22,7 +22,7 @@
 
 #include "mir_protobuf.pb.h"
 #include "mir/frontend/surface_id.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <unordered_map>
 #include <memory>
@@ -61,7 +61,7 @@
         std::shared_ptr<Shell> const& shell,
         std::shared_ptr<graphics::Platform> const& graphics_platform,
         std::shared_ptr<frontend::DisplayChanger> const& display_changer,
-        std::vector<geometry::PixelFormat> const& surface_pixel_formats,
+        std::vector<MirPixelFormat> const& surface_pixel_formats,
         std::shared_ptr<SessionMediatorReport> const& report,
         std::shared_ptr<EventSink> const& event_sink,
         std::shared_ptr<ResourceCache> const& resource_cache);
@@ -120,7 +120,7 @@
     std::shared_ptr<Shell> const shell;
     std::shared_ptr<graphics::Platform> const graphics_platform;
 
-    std::vector<geometry::PixelFormat> const surface_pixel_formats;
+    std::vector<MirPixelFormat> const surface_pixel_formats;
 
     std::shared_ptr<frontend::DisplayChanger> const display_changer;
     std::shared_ptr<SessionMediatorReport> const report;

=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
--- src/server/graphics/nested/nested_display_configuration.cpp	2013-11-27 12:28:24 +0000
+++ src/server/graphics/nested/nested_display_configuration.cpp	2013-12-02 16:56:54 +0000
@@ -55,10 +55,10 @@
         display_config->outputs+display_config->num_outputs,
         [&f](MirDisplayOutput const& mir_output)
         {
-            std::vector<geometry::PixelFormat> formats;
+            std::vector<MirPixelFormat> formats;
             formats.reserve(mir_output.num_output_formats);
             for (auto p = mir_output.output_formats; p != mir_output.output_formats+mir_output.num_output_formats; ++p)
-                formats.push_back(geometry::PixelFormat(*p));
+                formats.push_back(MirPixelFormat(*p));
 
             std::vector<DisplayConfigurationMode> modes;
             modes.reserve(mir_output.num_modes);

=== modified file 'src/server/graphics/offscreen/display_configuration.cpp'
--- src/server/graphics/offscreen/display_configuration.cpp	2013-11-12 17:23:53 +0000
+++ src/server/graphics/offscreen/display_configuration.cpp	2013-12-02 16:56:54 +0000
@@ -24,7 +24,7 @@
         : output{mg::DisplayConfigurationOutputId{1},
                  mg::DisplayConfigurationCardId{0},
                  mg::DisplayConfigurationOutputType::lvds,
-                 {geom::PixelFormat::xrgb_8888},
+                 {mir_pixel_format_xrgb_8888},
                  {mg::DisplayConfigurationMode{display_size,0.0f}},
                  0,
                  geom::Size{0,0},

=== modified file 'src/server/scene/basic_surface.h'
--- src/server/scene/basic_surface.h	2013-11-27 12:28:24 +0000
+++ src/server/scene/basic_surface.h	2013-12-02 16:56:54 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SCENE_BASIC_SURFACE_H_
 #define MIR_SCENE_BASIC_SURFACE_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/rectangle.h"
 #include "mir/graphics/buffer_properties.h"
 
@@ -62,7 +62,7 @@
     virtual geometry::Point top_left() const = 0;
     virtual geometry::Size size() const = 0;
 
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
 
     virtual std::shared_ptr<graphics::Buffer> snapshot_buffer() const = 0;
     virtual void swap_buffers(std::shared_ptr<graphics::Buffer>&) = 0;

=== modified file 'src/server/scene/surface.cpp'
--- src/server/scene/surface.cpp	2013-11-27 12:28:24 +0000
+++ src/server/scene/surface.cpp	2013-12-02 16:56:54 +0000
@@ -104,7 +104,7 @@
     return surface_state->size();
 }
 
-geom::PixelFormat ms::Surface::pixel_format() const
+MirPixelFormat ms::Surface::pixel_format() const
 {
     return surface_buffer_stream->get_stream_pixel_format();
 }

=== modified file 'src/server/scene/surface.h'
--- src/server/scene/surface.h	2013-11-27 12:28:24 +0000
+++ src/server/scene/surface.h	2013-12-02 16:56:54 +0000
@@ -47,7 +47,7 @@
     geometry::Point top_left() const;
     geometry::Size size() const;
 
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
 
     std::shared_ptr<graphics::Buffer> snapshot_buffer() const;
     void swap_buffers(std::shared_ptr<graphics::Buffer>& buffer);

=== modified file 'src/server/scene/surface_allocator.cpp'
--- src/server/scene/surface_allocator.cpp	2013-11-25 07:59:56 +0000
+++ src/server/scene/surface_allocator.cpp	2013-12-02 16:56:54 +0000
@@ -30,6 +30,12 @@
 namespace msh=mir::shell;
 namespace mi=mir::input;
 
+static inline bool has_alpha(MirPixelFormat fmt)
+{
+    return (fmt == mir_pixel_format_abgr_8888) ||
+           (fmt == mir_pixel_format_argb_8888);
+}
+
 ms::SurfaceAllocator::SurfaceAllocator(
     std::shared_ptr<BufferStreamFactory> const& stream_factory,
     std::shared_ptr<input::InputChannelFactory> const& input_factory,

=== modified file 'src/server/scene/surface_impl.cpp'
--- src/server/scene/surface_impl.cpp	2013-11-27 12:28:24 +0000
+++ src/server/scene/surface_impl.cpp	2013-12-02 16:56:54 +0000
@@ -99,7 +99,7 @@
     return surface->name();
 }
 
-mir::geometry::PixelFormat ms::SurfaceImpl::pixel_format() const
+MirPixelFormat ms::SurfaceImpl::pixel_format() const
 {
     return surface->pixel_format();
 }

=== modified file 'src/server/scene/surface_impl.h'
--- src/server/scene/surface_impl.h	2013-11-27 12:28:24 +0000
+++ src/server/scene/surface_impl.h	2013-12-02 16:56:54 +0000
@@ -68,7 +68,7 @@
     virtual geometry::Size size() const;
     virtual geometry::Point top_left() const;
 
-    virtual geometry::PixelFormat pixel_format() const;
+    virtual MirPixelFormat pixel_format() const;
 
     virtual void with_most_recent_buffer_do(
         std::function<void(graphics::Buffer&)> const& exec);

=== modified file 'src/server/shell/surface_creation_parameters.cpp'
--- src/server/shell/surface_creation_parameters.cpp	2013-11-27 12:28:24 +0000
+++ src/server/shell/surface_creation_parameters.cpp	2013-12-02 16:56:54 +0000
@@ -25,7 +25,7 @@
 
 msh::SurfaceCreationParameters::SurfaceCreationParameters()
     : name(), size(), top_left(), buffer_usage(mg::BufferUsage::undefined),
-      pixel_format(geom::PixelFormat::invalid),
+      pixel_format(mir_pixel_format_invalid),
       depth{0}, input_mode(mi::InputReceptionMode::normal)
 {
 }
@@ -68,7 +68,7 @@
 }
 
 msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_pixel_format(
-    geom::PixelFormat new_pixel_format)
+    MirPixelFormat new_pixel_format)
 {
     pixel_format = new_pixel_format;
 

=== modified file 'tests/acceptance-tests/test_surfaceloop.cpp'
--- tests/acceptance-tests/test_surfaceloop.cpp	2013-11-25 07:59:56 +0000
+++ tests/acceptance-tests/test_surfaceloop.cpp	2013-12-02 16:56:54 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 #include "mir_toolkit/mir_client_library.h"

=== modified file 'tests/draw/android_graphics.cpp'
--- tests/draw/android_graphics.cpp	2013-11-25 07:59:56 +0000
+++ tests/draw/android_graphics.cpp	2013-12-02 16:56:54 +0000
@@ -18,7 +18,7 @@
 
 
 #include "mir_test/draw/android_graphics.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <fstream>
 #include <stdexcept>
@@ -107,7 +107,7 @@
     RegionDeleter del(module, package->handle);
 
     region->vaddr = (char*) vaddr;
-    region->stride = package->stride * geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+   region->stride = package->stride * MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     region->width = package->width;
     region->height = package->height;
     region->pixel_format = mir_pixel_format_abgr_8888;

=== modified file 'tests/draw/patterns.cpp'
--- tests/draw/patterns.cpp	2013-11-25 07:59:56 +0000
+++ tests/draw/patterns.cpp	2013-12-02 16:56:54 +0000
@@ -16,11 +16,10 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir_test/draw/patterns.h"
 
 namespace mtd=mir::test::draw;
-namespace geom=mir::geometry;
 
 mtd::DrawPatternSolid::DrawPatternSolid(uint32_t color_value)
  : color_value(color_value)
@@ -32,7 +31,7 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888 )
         throw(std::runtime_error("cannot draw region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(auto i = 0; i < region.height; i++)
     {
         for(auto j = 0; j < region.width; j++)
@@ -48,7 +47,7 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888 )
         throw(std::runtime_error("cannot check region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(auto i = 0; i < region.height; i++)
     {
         for(auto j = 0; j < region.width; j++)

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2013-11-28 14:17:01 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2013-12-02 16:56:54 +0000
@@ -192,7 +192,7 @@
         auto initializer = std::make_shared<mg::NullBufferInitializer>();
         allocator = std::make_shared<mga::AndroidGraphicBufferAllocator> (initializer);
         auto size = geom::Size{test_width, test_height};
-        surface_pf = geom::PixelFormat::abgr_8888;
+        surface_pf = mir_pixel_format_abgr_8888;
         last_posted = allocator->alloc_buffer_platform(size, surface_pf, mga::BufferUsage::use_hardware);
         client_buffer = allocator->alloc_buffer_platform(size, surface_pf, mga::BufferUsage::use_hardware);
     }
@@ -205,7 +205,7 @@
         response->mutable_id()->set_value(13);
         response->set_width(test_width);
         response->set_height(test_height);
-        surface_pf = geom::PixelFormat(request->pixel_format());
+        surface_pf = MirPixelFormat(request->pixel_format());
         response->set_pixel_format(request->pixel_format());
         response->mutable_buffer()->set_buffer_id(client_buffer->id().as_uint32_t());
 
@@ -260,10 +260,10 @@
 
     uint32_t red_value_for_surface()
     {
-        if ((surface_pf == geom::PixelFormat::abgr_8888) || (surface_pf == geom::PixelFormat::xbgr_8888))
+        if ((surface_pf == mir_pixel_format_abgr_8888) || (surface_pf == mir_pixel_format_xbgr_8888))
             return 0xFF0000FF;
 
-        if ((surface_pf == geom::PixelFormat::argb_8888) || (surface_pf == geom::PixelFormat::xrgb_8888))
+        if ((surface_pf == mir_pixel_format_argb_8888) || (surface_pf == mir_pixel_format_xrgb_8888))
             return 0xFFFF0000;
 
         return 0x0;
@@ -291,7 +291,7 @@
     std::shared_ptr<mg::Buffer> client_buffer;
     std::shared_ptr<mg::Buffer> last_posted;
     std::mutex buffer_mutex;
-    geom::PixelFormat surface_pf;
+    MirPixelFormat surface_pf;
 };
 
 }

=== modified file 'tests/integration-tests/compositor/test_buffer_stream.cpp'
--- tests/integration-tests/compositor/test_buffer_stream.cpp	2013-11-27 12:28:24 +0000
+++ tests/integration-tests/compositor/test_buffer_stream.cpp	2013-12-02 16:56:54 +0000
@@ -51,7 +51,7 @@
     {
         auto allocator = std::make_shared<mtd::StubBufferAllocator>();
         mg::BufferProperties properties{geom::Size{380, 210},
-                                        geom::PixelFormat::abgr_8888,
+                                        mir_pixel_format_abgr_8888,
                                         mg::BufferUsage::hardware};
 
         return std::make_shared<mc::SwitchingBundle>(nbuffers,

=== modified file 'tests/integration-tests/compositor/test_swapping_swappers.cpp'
--- tests/integration-tests/compositor/test_swapping_swappers.cpp	2013-11-27 12:28:24 +0000
+++ tests/integration-tests/compositor/test_swapping_swappers.cpp	2013-12-02 16:56:54 +0000
@@ -43,7 +43,7 @@
     {
         auto allocator = std::make_shared<mtd::StubBufferAllocator>();
         auto properties = mg::BufferProperties{geom::Size{380, 210},
-                                          geom::PixelFormat::abgr_8888,
+                                          mir_pixel_format_abgr_8888,
                                           mg::BufferUsage::hardware};
         switching_bundle = std::make_shared<mc::SwitchingBundle>(3, allocator, properties);
     }

=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-11-28 14:17:01 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-12-02 16:56:54 +0000
@@ -43,14 +43,14 @@
     virtual void SetUp()
     {
         size = geom::Size{334, 122};
-        pf  = geom::PixelFormat::abgr_8888;
+        pf  = mir_pixel_format_abgr_8888;
         buffer_properties = mg::BufferProperties{size, pf, mg::BufferUsage::software};
         null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
     }
 
     std::shared_ptr<mg::BufferInitializer> null_buffer_initializer;
     geom::Size size;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     mg::BufferProperties buffer_properties;
     mtd::TestGrallocMapper sw_renderer;
 };

=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2013-11-28 14:17:01 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2013-12-02 16:56:54 +0000
@@ -80,7 +80,7 @@
 TEST_F(AndroidInternalClient, internal_client_creation_and_use)
 {
     auto size = geom::Size{334, 122};
-    auto pf  = geom::PixelFormat::abgr_8888;
+    auto pf  = mir_pixel_format_abgr_8888;
     msh::SurfaceCreationParameters params;
     params.name = std::string("test");
     params.size = size;

=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-11-28 14:17:01 +0000
+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-12-02 16:56:54 +0000
@@ -105,7 +105,7 @@
         auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
         allocator = platform->create_buffer_allocator(buffer_initializer);
         size = geom::Size{100, 100};
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         usage = mg::BufferUsage::hardware;
         buffer_properties = mg::BufferProperties{size, pf, usage};
     }
@@ -114,7 +114,7 @@
     std::shared_ptr<mg::Display> display;
     std::shared_ptr<mg::GraphicBufferAllocator> allocator;
     geom::Size size;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     mg::BufferUsage usage;
     mg::BufferProperties buffer_properties;
 };

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-11-27 12:28:24 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-12-02 16:56:54 +0000
@@ -85,7 +85,7 @@
 
 mtd::StubDisplayConfig StubChanger::stub_display_config{
     2,
-    { geom::PixelFormat::xrgb_8888 }
+    { mir_pixel_format_xrgb_8888 }
 };
 
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
@@ -93,18 +93,18 @@
 class StubGraphicBufferAllocator : public mtd::StubBufferAllocator
 {
 public:
-    std::vector<geom::PixelFormat> supported_pixel_formats() override
+    std::vector<MirPixelFormat> supported_pixel_formats() override
     {
         return pixel_formats;
     }
 
-    static std::vector<geom::PixelFormat> const pixel_formats;
+    static std::vector<MirPixelFormat> const pixel_formats;
 };
 
-std::vector<geom::PixelFormat> const StubGraphicBufferAllocator::pixel_formats{
-    geom::PixelFormat::argb_8888,
-    geom::PixelFormat::xbgr_8888,
-    geom::PixelFormat::bgr_888
+std::vector<MirPixelFormat> const StubGraphicBufferAllocator::pixel_formats{
+    mir_pixel_format_argb_8888,
+    mir_pixel_format_xbgr_8888,
+    mir_pixel_format_bgr_888
 };
 
 class StubPlatform : public mtd::NullPlatform
@@ -174,7 +174,7 @@
             for (auto i=0u; i < returned_format_size; ++i)
             {
                 EXPECT_EQ(StubGraphicBufferAllocator::pixel_formats[i],
-                          static_cast<geom::PixelFormat>(formats[i])) << "i=" << i;
+                          formats[i]) << "i=" << i;
             }
 
             mir_connection_release(connection);

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-11-25 07:59:56 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-12-02 16:56:54 +0000
@@ -49,7 +49,7 @@
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
 
 geom::Size const size{640, 480};
-geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
+MirPixelFormat const format{mir_pixel_format_abgr_8888};
 mg::BufferUsage const usage{mg::BufferUsage::hardware};
 mg::BufferProperties const buffer_properties{size, format, usage};
 

=== modified file 'tests/integration-tests/test_swapinterval.cpp'
--- tests/integration-tests/test_swapinterval.cpp	2013-11-27 12:28:24 +0000
+++ tests/integration-tests/test_swapinterval.cpp	2013-12-02 16:56:54 +0000
@@ -60,7 +60,7 @@
     void release_client_buffer(std::shared_ptr<mg::Buffer>& buffer) { buffer.reset(); }
     std::shared_ptr<mg::Buffer> lock_compositor_buffer(unsigned long) { return std::make_shared<mtd::StubBuffer>(); }
     std::shared_ptr<mg::Buffer> lock_snapshot_buffer() { return std::make_shared<mtd::StubBuffer>(); }
-    geom::PixelFormat get_stream_pixel_format() { return geom::PixelFormat::abgr_8888; }
+    MirPixelFormat get_stream_pixel_format() { return mir_pixel_format_abgr_8888; }
     geom::Size stream_size() { return geom::Size{}; }
     void resize(geom::Size const&) override {}
     void force_requests_to_complete() {}

=== modified file 'tests/mir_test/display_config_matchers.cpp'
--- tests/mir_test/display_config_matchers.cpp	2013-09-12 21:36:55 +0000
+++ tests/mir_test/display_config_matchers.cpp	2013-12-02 16:56:54 +0000
@@ -86,11 +86,11 @@
             display_output.modes = modes;
 
             /* Pixel formats */
-            std::vector<geom::PixelFormat> pixel_formats;
+            std::vector<MirPixelFormat> pixel_formats;
             for (int n = 0; n < protobuf_output.pixel_format_size(); n++)
             {
                 pixel_formats.push_back(
-                    static_cast<geom::PixelFormat>(protobuf_output.pixel_format(n)));
+                    static_cast<MirPixelFormat>(protobuf_output.pixel_format(n)));
             }
             display_output.pixel_formats = pixel_formats;
 
@@ -151,11 +151,10 @@
             display_output.modes = modes;
 
             /* Pixel formats */
-            std::vector<geom::PixelFormat> pixel_formats;
+            std::vector<MirPixelFormat> pixel_formats;
             for (size_t n = 0; n < client_output.num_output_formats; n++)
             {
-                pixel_formats.push_back(
-                    static_cast<geom::PixelFormat>(client_output.output_formats[n]));
+                pixel_formats.push_back(client_output.output_formats[n]);
             }
             display_output.pixel_formats = pixel_formats;
 

=== modified file 'tests/mir_test_framework/testing_client_options.cpp'
--- tests/mir_test_framework/testing_client_options.cpp	2013-11-27 12:28:24 +0000
+++ tests/mir_test_framework/testing_client_options.cpp	2013-12-02 16:56:54 +0000
@@ -50,9 +50,9 @@
         return geom::Stride{};
     }
 
-    geom::PixelFormat pixel_format() const
+    MirPixelFormat pixel_format() const
     {
-        return geom::PixelFormat::abgr_8888;
+        return mir_pixel_format_abgr_8888;
     }
 
     uint32_t age() const
@@ -74,7 +74,7 @@
 struct StubClientBufferFactory : public mcl::ClientBufferFactory
 {
     std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const&,
-                                                     geom::Size, geom::PixelFormat)
+                                                     geom::Size, MirPixelFormat)
     {
         return std::make_shared<StubClientBuffer>();
     }

=== modified file 'tests/mir_test_framework/testing_server_options.cpp'
--- tests/mir_test_framework/testing_server_options.cpp	2013-11-27 12:28:24 +0000
+++ tests/mir_test_framework/testing_server_options.cpp	2013-12-02 16:56:54 +0000
@@ -137,7 +137,7 @@
             mg::DisplayConfigurationOutputId{1},
             mg::DisplayConfigurationCardId{0},
             mg::DisplayConfigurationOutputType::vga,
-            std::vector<geom::PixelFormat>{geom::PixelFormat::abgr_8888},
+            std::vector<MirPixelFormat>{mir_pixel_format_abgr_8888},
             modes, 0, geom::Size{}, true, true, geom::Point{0,0}, 0, 0, mir_power_mode_on};
 
         f(dummy_output_config);

=== modified file 'tests/unit-tests/client/android/test_client_android_buffer.cpp'
--- tests/unit-tests/client/android/test_client_android_buffer.cpp	2013-11-25 07:59:56 +0000
+++ tests/unit-tests/client/android/test_client_android_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -43,7 +43,7 @@
         width = geom::Width(248);
         size = geom::Size{width, height};
         stride = geom::Stride{66};
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
 
         mock_android_registrar = std::make_shared<NiceMock<mtd::MockAndroidRegistrar>>();
 
@@ -55,7 +55,7 @@
     geom::Height height;
     geom::Width width;
     geom::Stride stride;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     std::shared_ptr<mcla::AndroidClientBuffer> buffer;
     std::shared_ptr<mtd::MockAndroidRegistrar> mock_android_registrar;
 };
@@ -139,7 +139,7 @@
 {
     int correct_usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
     int32_t const expected_stride_in_pixels =
-        static_cast<int32_t>(stride.as_uint32_t() / geom::bytes_per_pixel(pf));
+        static_cast<int32_t>(stride.as_uint32_t() / MIR_BYTES_PER_PIXEL(pf));
     mcla::AndroidClientBuffer buffer(mock_android_registrar, package, size, pf, stride);
     auto native_handle = buffer.native_buffer_handle();
     ASSERT_NE(nullptr, native_handle);

=== modified file 'tests/unit-tests/client/android/test_client_surface_interpreter.cpp'
--- tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2013-12-02 16:56:54 +0000
@@ -48,7 +48,7 @@
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geom::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(age, uint32_t());
     MOCK_METHOD0(mark_as_submitted, void());

=== modified file 'tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp'
--- tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp	2013-11-27 15:25:10 +0000
+++ tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -48,7 +48,7 @@
         width = geom::Width(12);
         height =geom::Height(14);
         stride = geom::Stride(66);
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         size = geom::Size{width, height};
         buffer_file_ops = std::make_shared<testing::NiceMock<MockBufferFileOps>>();
 
@@ -64,7 +64,7 @@
     geom::Width width;
     geom::Height height;
     geom::Stride stride;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
 
     std::shared_ptr<testing::NiceMock<MockBufferFileOps>> buffer_file_ops;

=== modified file 'tests/unit-tests/client/gbm/test_native_surface.cpp'
--- tests/unit-tests/client/gbm/test_native_surface.cpp	2013-06-28 00:24:30 +0000
+++ tests/unit-tests/client/gbm/test_native_surface.cpp	2013-12-02 16:56:54 +0000
@@ -44,7 +44,7 @@
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geom::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(age, uint32_t());
     MOCK_METHOD0(mark_as_submitted, void());

=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
--- tests/unit-tests/client/test_aging_buffer.cpp	2013-10-15 08:53:10 +0000
+++ tests/unit-tests/client/test_aging_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -46,7 +46,7 @@
         exit(1);
     }
 
-    geom::PixelFormat pixel_format() const
+    MirPixelFormat pixel_format() const
     {
         exit(1);
     }

=== modified file 'tests/unit-tests/client/test_android_client_buffer_factory.cpp'
--- tests/unit-tests/client/test_android_client_buffer_factory.cpp	2013-11-25 07:59:56 +0000
+++ tests/unit-tests/client/test_android_client_buffer_factory.cpp	2013-12-02 16:56:54 +0000
@@ -36,7 +36,7 @@
         width = geom::Width(12);
         height =geom::Height(14);
         size = geom::Size{width, height};
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
 
         mock_registrar = std::make_shared<mtd::MockAndroidRegistrar>();
 
@@ -46,7 +46,7 @@
     }
     geom::Width width;
     geom::Height height;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
 
     std::shared_ptr<mtd::MockAndroidRegistrar> mock_registrar;

=== modified file 'tests/unit-tests/client/test_client_buffer_depository.cpp'
--- tests/unit-tests/client/test_client_buffer_depository.cpp	2013-10-15 08:53:10 +0000
+++ tests/unit-tests/client/test_client_buffer_depository.cpp	2013-12-02 16:56:54 +0000
@@ -20,7 +20,7 @@
 #include "src/client/client_buffer_depository.h"
 #include "src/client/client_buffer_factory.h"
 #include "src/client/aging_buffer.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 #include <gtest/gtest.h>
@@ -51,7 +51,7 @@
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geom::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
     MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<mir::graphics::NativeBuffer>());
 };
 
@@ -70,7 +70,7 @@
 
     MOCK_METHOD3(create_buffer,
                  std::shared_ptr<mcl::ClientBuffer>(std::shared_ptr<MirBufferPackage> const&,
-                                                    geom::Size, geom::PixelFormat));
+                                                    geom::Size, MirPixelFormat));
 
     std::shared_ptr<mcl::ClientBuffer> buffer;
 };
@@ -81,7 +81,7 @@
     {
         width = geom::Width(12);
         height =geom::Height(14);
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         size = geom::Size{width, height};
 
         package = std::make_shared<MirBufferPackage>();
@@ -89,7 +89,7 @@
     }
     geom::Width width;
     geom::Height height;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
 
     std::shared_ptr<MirBufferPackage> package;

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2013-12-02 16:56:54 +0000
@@ -180,7 +180,7 @@
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geom::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
     MOCK_CONST_METHOD0(age, uint32_t());
     MOCK_METHOD0(increment_age, void());
     MOCK_METHOD0(mark_as_submitted, void());
@@ -203,7 +203,7 @@
 
     MOCK_METHOD3(create_buffer,
                  std::shared_ptr<mcl::ClientBuffer>(std::shared_ptr<MirBufferPackage> const&,
-                                                    geom::Size, geom::PixelFormat));
+                                                    geom::Size, MirPixelFormat));
 
     std::shared_ptr<MirBufferPackage> current_package;
     std::shared_ptr<mcl::ClientBuffer> current_buffer;
@@ -469,7 +469,7 @@
 {
     using namespace testing;
 
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     std::shared_ptr<MirBufferPackage> submitted_package;
 
     EXPECT_CALL(*mock_buffer_factory, create_buffer(_,_,_))
@@ -482,7 +482,7 @@
     auto wait_handle = surface->get_create_wait_handle();
     wait_handle->wait_for_all();
 
-    EXPECT_EQ(pf, geom::PixelFormat::abgr_8888);
+    EXPECT_EQ(pf, mir_pixel_format_abgr_8888);
 }
 
 
@@ -637,7 +637,7 @@
 
 struct StubBuffer : public mcl::ClientBuffer
 {
-    StubBuffer(geom::Size size, geom::Stride stride, geom::PixelFormat pf)
+    StubBuffer(geom::Size size, geom::Stride stride, MirPixelFormat pf)
         : size_{size}, stride_{stride}, pf_{pf}
     {
     }
@@ -655,7 +655,7 @@
 
     geom::Size size() const { return size_; }
     geom::Stride stride() const { return stride_; }
-    geom::PixelFormat pixel_format() const { return pf_; }
+    MirPixelFormat pixel_format() const { return pf_; }
     uint32_t age() const { return 0; }
     void increment_age() {}
     void mark_as_submitted() {}
@@ -667,14 +667,14 @@
 
     geom::Size size_;
     geom::Stride stride_;
-    geom::PixelFormat pf_;
+    MirPixelFormat pf_;
 };
 
 struct StubClientBufferFactory : public mcl::ClientBufferFactory
 {
     std::shared_ptr<mcl::ClientBuffer> create_buffer(
         std::shared_ptr<MirBufferPackage> const& package,
-        geom::Size size, geom::PixelFormat pf)
+        geom::Size size, MirPixelFormat pf)
     {
         return std::make_shared<StubBuffer>(size,
                                             geom::Stride{package->stride},

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2013-12-02 16:56:54 +0000
@@ -78,7 +78,7 @@
 struct StubClientBufferFactory : public mcl::ClientBufferFactory
 {
     std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& /* package */,
-                                                     geom::Size /*size*/, geom::PixelFormat /*pf*/) override
+                                                     geom::Size /*size*/, MirPixelFormat /*pf*/) override
     {
         return std::shared_ptr<mcl::ClientBuffer>();
     }

=== modified file 'tests/unit-tests/compositor/test_buffer_stream.cpp'
--- tests/unit-tests/compositor/test_buffer_stream.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/compositor/test_buffer_stream.cpp	2013-12-02 16:56:54 +0000
@@ -50,7 +50,7 @@
 TEST_F(BufferStreamTest, size_query)
 {
     geom::Size size{4, 5};
-    mg::BufferProperties properties {size, geom::PixelFormat::abgr_8888, mg::BufferUsage::hardware};
+    mg::BufferProperties properties {size, mir_pixel_format_abgr_8888, mg::BufferUsage::hardware};
     EXPECT_CALL(*mock_bundle, properties())
         .Times(1)
         .WillOnce(testing::Return(properties));
@@ -62,7 +62,7 @@
 
 TEST_F(BufferStreamTest, pixel_format_query)
 {
-    geom::PixelFormat format{geom::PixelFormat::abgr_8888};
+    MirPixelFormat format{mir_pixel_format_abgr_8888};
     mg::BufferProperties properties {geom::Size{4, 5}, format, mg::BufferUsage::hardware};
     EXPECT_CALL(*mock_bundle, properties())
         .Times(1)

=== modified file 'tests/unit-tests/compositor/test_switching_bundle.cpp'
--- tests/unit-tests/compositor/test_switching_bundle.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/compositor/test_switching_bundle.cpp	2013-12-02 16:56:54 +0000
@@ -42,7 +42,7 @@
         basic_properties =
         {
             geom::Size{3, 4},
-            geom::PixelFormat::abgr_8888,
+            mir_pixel_format_abgr_8888,
             mg::BufferUsage::hardware
         };
     }
@@ -55,7 +55,7 @@
 TEST_F(SwitchingBundleTest, sync_swapper_by_default)
 {
     mg::BufferProperties properties{geom::Size{7, 8},
-                                    geom::PixelFormat::argb_8888,
+                                    mir_pixel_format_argb_8888,
                                     mg::BufferUsage::software};
 
     for (int nbuffers = mc::SwitchingBundle::min_buffers;

=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
--- tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-12-02 16:56:54 +0000
@@ -45,7 +45,7 @@
     TemporaryBuffersTest()
         : buffer_size{1024, 768},
           buffer_stride{1024},
-          buffer_pixel_format{geom::PixelFormat::abgr_8888},
+          buffer_pixel_format{mir_pixel_format_abgr_8888},
           mock_buffer{std::make_shared<testing::NiceMock<mtd::MockBuffer>>(
                           buffer_size, buffer_stride, buffer_pixel_format)},
           mock_bundle{std::make_shared<testing::NiceMock<mtd::MockBufferBundle>>()}
@@ -60,7 +60,7 @@
 
     geom::Size const buffer_size;
     geom::Stride const buffer_stride;
-    geom::PixelFormat const buffer_pixel_format;
+    MirPixelFormat const buffer_pixel_format;
     std::shared_ptr<mtd::MockBuffer> const mock_buffer;
     std::shared_ptr<mtd::MockBufferBundle> mock_bundle;
 };
@@ -116,7 +116,7 @@
     EXPECT_CALL(*mock_buffer, pixel_format())
         .Times(1);
 
-    geom::PixelFormat pixel_format;
+    MirPixelFormat pixel_format;
     pixel_format = proxy_buffer.pixel_format();
     EXPECT_EQ(buffer_pixel_format, pixel_format);
 }

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-12-02 16:56:54 +0000
@@ -99,10 +99,10 @@
 
         mock_surface = std::make_shared<mtd::MockFrontendSurface>();
         mock_surfaces[mf::SurfaceId{1}] = mock_surface;
-        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>(geom::Size(), geom::Stride(), geom::PixelFormat());
+        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>(geom::Size(), geom::Stride(), MirPixelFormat());
 
         EXPECT_CALL(*mock_surface, size()).Times(AnyNumber()).WillRepeatedly(Return(geom::Size()));
-        EXPECT_CALL(*mock_surface, pixel_format()).Times(AnyNumber()).WillRepeatedly(Return(geom::PixelFormat()));
+        EXPECT_CALL(*mock_surface, pixel_format()).Times(AnyNumber()).WillRepeatedly(Return(MirPixelFormat()));
         EXPECT_CALL(*mock_surface, swap_buffers(_)).Times(AnyNumber()).WillRepeatedly(SetArg<0>(mock_buffer));
 
         EXPECT_CALL(*mock_surface, supports_input()).Times(AnyNumber()).WillRepeatedly(Return(true));
@@ -122,7 +122,7 @@
             mock_surfaces[id] = std::make_shared<mtd::MockFrontendSurface>();
 
             EXPECT_CALL(*mock_surfaces[id], size()).Times(AnyNumber()).WillRepeatedly(Return(geom::Size()));
-            EXPECT_CALL(*mock_surfaces[id], pixel_format()).Times(AnyNumber()).WillRepeatedly(Return(geom::PixelFormat()));
+            EXPECT_CALL(*mock_surfaces[id], pixel_format()).Times(AnyNumber()).WillRepeatedly(Return(MirPixelFormat()));
             EXPECT_CALL(*mock_surfaces[id], swap_buffers(_)).Times(AnyNumber()).WillRepeatedly(SetArg<0>(mock_buffer));
 
             EXPECT_CALL(*mock_surfaces[id], supports_input()).Times(AnyNumber()).WillRepeatedly(Return(true));
@@ -153,10 +153,10 @@
     MockGraphicBufferAllocator()
     {
         ON_CALL(*this, supported_pixel_formats())
-            .WillByDefault(testing::Return(std::vector<geom::PixelFormat>()));
+            .WillByDefault(testing::Return(std::vector<MirPixelFormat>()));
     }
 
-    MOCK_METHOD0(supported_pixel_formats, std::vector<geom::PixelFormat>());
+    MOCK_METHOD0(supported_pixel_formats, std::vector<MirPixelFormat>());
 };
 
 class MockPlatform : public mg::Platform
@@ -189,7 +189,7 @@
         : shell{std::make_shared<testing::NiceMock<mtd::MockShell>>()},
           graphics_platform{std::make_shared<testing::NiceMock<MockPlatform>>()},
           graphics_changer{std::make_shared<mtd::NullDisplayChanger>()},
-          surface_pixel_formats{geom::PixelFormat::argb_8888, geom::PixelFormat::xrgb_8888},
+          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
           mediator{shell, graphics_platform, graphics_changer,
@@ -209,7 +209,7 @@
     std::shared_ptr<testing::NiceMock<mtd::MockShell>> const shell;
     std::shared_ptr<MockPlatform> const graphics_platform;
     std::shared_ptr<mf::DisplayChanger> const graphics_changer;
-    std::vector<geom::PixelFormat> const surface_pixel_formats;
+    std::vector<MirPixelFormat> const surface_pixel_formats;
     std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
     mf::SessionMediator mediator;

=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-11-25 07:59:56 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-12-02 16:56:54 +0000
@@ -53,7 +53,7 @@
         : shell{std::make_shared<mtd::StubShell>()},
           graphics_platform{std::make_shared<mtd::NullPlatform>()},
           display_changer{std::make_shared<mtd::NullDisplayChanger>()},
-          surface_pixel_formats{geom::PixelFormat::argb_8888, geom::PixelFormat::xrgb_8888},
+          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
           mediator{shell, graphics_platform, display_changer,
@@ -67,7 +67,7 @@
     std::shared_ptr<mtd::StubShell> const shell;
     std::shared_ptr<mtd::NullPlatform> const graphics_platform;
     std::shared_ptr<mf::DisplayChanger> const display_changer;
-    std::vector<geom::PixelFormat> const surface_pixel_formats;
+    std::vector<MirPixelFormat> const surface_pixel_formats;
     std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
     mf::SessionMediator mediator;

=== modified file 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
--- tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-11-25 07:59:56 +0000
+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-12-02 16:56:54 +0000
@@ -66,7 +66,7 @@
         : shell{std::make_shared<mtd::StubShell>()},
           mock_platform{std::make_shared<MockAuthenticatingPlatform>()},
           display_changer{std::make_shared<mtd::NullDisplayChanger>()},
-          surface_pixel_formats{geom::PixelFormat::argb_8888, geom::PixelFormat::xrgb_8888},
+          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
           mediator{shell, mock_platform, display_changer,
@@ -80,7 +80,7 @@
     std::shared_ptr<mtd::StubShell> const shell;
     std::shared_ptr<MockAuthenticatingPlatform> const mock_platform;
     std::shared_ptr<mf::DisplayChanger> const display_changer;
-    std::vector<geom::PixelFormat> const surface_pixel_formats;
+    std::vector<MirPixelFormat> const surface_pixel_formats;
     std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
     mf::SessionMediator mediator;

=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-12-02 16:56:54 +0000
@@ -48,7 +48,7 @@
 
         alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device);
 
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         size = geom::Size{300, 200};
         usage = mga::BufferUsage::use_hardware;
     }
@@ -56,7 +56,7 @@
     std::shared_ptr<mtd::MockAllocDevice> mock_alloc_device;
     std::shared_ptr<mga::AndroidAllocAdaptor> alloc_adaptor;
 
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
     mga::BufferUsage usage;
     int const fb_usage_flags;
@@ -197,7 +197,7 @@
 
 TEST_F(AdaptorICSTest, handle_buffer_pf_is_converted_to_android_xbgr_8888)
 {
-    auto native_handle = alloc_adaptor->alloc_buffer(size, geom::PixelFormat::xbgr_8888, usage);
+    auto native_handle = alloc_adaptor->alloc_buffer(size, mir_pixel_format_xbgr_8888, usage);
     auto anwb = native_handle->anwb();
     EXPECT_EQ(HAL_PIXEL_FORMAT_RGBX_8888, anwb->format);
 }

=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-12-02 16:56:54 +0000
@@ -62,15 +62,15 @@
 
     auto abgr_8888_count = std::count(supported_pixel_formats.begin(),
                                       supported_pixel_formats.end(),
-                                      geom::PixelFormat::abgr_8888);
+                                      mir_pixel_format_abgr_8888);
 
     auto xbgr_8888_count = std::count(supported_pixel_formats.begin(),
                                       supported_pixel_formats.end(),
-                                      geom::PixelFormat::xbgr_8888);
+                                      mir_pixel_format_xbgr_8888);
 
     auto bgr_888_count = std::count(supported_pixel_formats.begin(),
                                     supported_pixel_formats.end(),
-                                    geom::PixelFormat::bgr_888);
+                                    mir_pixel_format_bgr_888);
 
     EXPECT_EQ(1, abgr_8888_count);
     EXPECT_EQ(1, xbgr_8888_count);
@@ -83,7 +83,7 @@
     auto supported_pixel_formats = allocator.supported_pixel_formats();
 
     ASSERT_FALSE(supported_pixel_formats.empty());
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, supported_pixel_formats[0]);
+    EXPECT_EQ(mir_pixel_format_abgr_8888, supported_pixel_formats[0]);
 }
 
 TEST_F(AndroidGraphicBufferAllocatorTest, alloc_buffer_calls_initializer)
@@ -93,7 +93,7 @@
     auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>();
 
     mg::BufferProperties properties{geom::Size{2, 2},
-                                    geom::PixelFormat::abgr_8888,
+                                    mir_pixel_format_abgr_8888,
                                     mg::BufferUsage::hardware};
     mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
     EXPECT_CALL(*buffer_initializer, operator_call(_))
@@ -110,7 +110,7 @@
 
     mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
     auto size = geom::Size{2, 2};
-    auto pf = geom::PixelFormat::abgr_8888;
+    auto pf = mir_pixel_format_abgr_8888;
 
     EXPECT_CALL(*buffer_initializer, operator_call(_))
         .Times(1);

=== modified file 'tests/unit-tests/graphics/android/test_buffer.cpp'
--- tests/unit-tests/graphics/android/test_buffer.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -51,7 +51,7 @@
         anwb->format = HAL_PIXEL_FORMAT_RGBA_8888;
 
         default_use = mga::BufferUsage::use_hardware;
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         size = geom::Size{300, 200};
         extensions = std::make_shared<mg::EGLExtensions>();
     }
@@ -59,7 +59,7 @@
     ANativeWindowBuffer *anwb;
     testing::NiceMock<mtd::MockEGL> mock_egl;
     std::shared_ptr<mtd::MockAndroidNativeBuffer> mock_native_buffer;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
     mga::BufferUsage default_use;
     std::shared_ptr<mg::EGLExtensions> extensions;
@@ -80,7 +80,7 @@
     using namespace testing;
 
     mga::Buffer buffer(mock_native_buffer, extensions);
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, buffer.pixel_format());
+    EXPECT_EQ(mir_pixel_format_abgr_8888, buffer.pixel_format());
 }
 
 TEST_F(AndroidGraphicBufferBasic, returns_native_buffer_times_two)
@@ -112,7 +112,7 @@
     using namespace testing;
 
     geom::Stride expected_stride{anwb->stride *
-                                 geom::bytes_per_pixel(pf)};
+                                 MIR_BYTES_PER_PIXEL(pf)};
     mga::Buffer buffer(mock_native_buffer, extensions);
     EXPECT_EQ(expected_stride, buffer.stride());
 }

=== modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp'
--- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2013-12-02 16:56:54 +0000
@@ -40,12 +40,12 @@
 
         mock_native_buffer = std::make_shared<NiceMock<mtd::MockAndroidNativeBuffer>>();
         size = geom::Size{300, 220};
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         extensions = std::make_shared<mg::EGLExtensions>();
     };
 
     geom::Size size;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
 
     testing::NiceMock<mtd::MockEGL> mock_egl;
     std::shared_ptr<mg::EGLExtensions> extensions;

=== modified file 'tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp'
--- tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2013-12-02 16:56:54 +0000
@@ -40,7 +40,7 @@
 struct MockGraphicBufferAllocator : public mga::GraphicBufferAllocator
 {
     MOCK_METHOD3(alloc_buffer_platform, std::shared_ptr<mg::Buffer>(
-        geom::Size, geom::PixelFormat, mga::BufferUsage use));
+        geom::Size, MirPixelFormat, mga::BufferUsage use));
 };
 
 static int const display_width = 180;
@@ -143,7 +143,7 @@
         .InSequence(seq);
 
     mga::Framebuffers framebuffers(mock_allocator, mock_hwc_device);
-    EXPECT_EQ(geom::PixelFormat::argb_8888, framebuffers.fb_format());
+    EXPECT_EQ(mir_pixel_format_argb_8888, framebuffers.fb_format());
 }
 
 //apparently this can happen if the display is in the 'unplugged state'
@@ -180,20 +180,20 @@
         .InSequence(seq);
 
     mga::Framebuffers framebuffers(mock_allocator, mock_hwc_device);
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, framebuffers.fb_format());
+    EXPECT_EQ(mir_pixel_format_abgr_8888, framebuffers.fb_format());
 }
 
 TEST_F(PostingFBBundleTest, bundle_from_fb)
 {
     using namespace testing;
     auto display_size = geom::Size{display_width, display_height};
-    EXPECT_CALL(*mock_allocator, alloc_buffer_platform(display_size, geom::PixelFormat::abgr_8888, mga::BufferUsage::use_framebuffer_gles))
+    EXPECT_CALL(*mock_allocator, alloc_buffer_platform(display_size, mir_pixel_format_abgr_8888, mga::BufferUsage::use_framebuffer_gles))
         .Times(fbnum)
         .WillRepeatedly(Return(nullptr));
 
     mga::Framebuffers framebuffers(mock_allocator, mock_fb_hal);
     EXPECT_EQ(display_size, framebuffers.fb_size());
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, framebuffers.fb_format());
+    EXPECT_EQ(mir_pixel_format_abgr_8888, framebuffers.fb_format());
 }
 
 //some drivers incorrectly report 0 buffers available. if this is true, we should alloc 2, the minimum requirement

=== modified file 'tests/unit-tests/graphics/android/test_hwc10_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-12-02 16:56:54 +0000
@@ -40,7 +40,7 @@
         int width = 88;
         int height = 4;
         test_size = geom::Size{width, height};
-        test_pf = geom::PixelFormat::abgr_8888;
+        test_pf = mir_pixel_format_abgr_8888;
         int fbnum = 558;
         mock_hwc_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>();
         mock_fb_device = std::make_shared<mtd::MockFBHalDevice>(
@@ -49,7 +49,7 @@
         mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
     }
 
-    geom::PixelFormat test_pf;
+    MirPixelFormat test_pf;
     geom::Size test_size;
     std::shared_ptr<mtd::MockHWCComposerDevice1> mock_hwc_device;
     std::shared_ptr<mtd::MockFBHalDevice> mock_fb_device;

=== modified file 'tests/unit-tests/graphics/android/test_output_builder.cpp'
--- tests/unit-tests/graphics/android/test_output_builder.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_output_builder.cpp	2013-12-02 16:56:54 +0000
@@ -51,7 +51,7 @@
             .WillByDefault(Return(nullptr));
     }
     MOCK_METHOD3(alloc_buffer_platform,
-        std::shared_ptr<mg::Buffer>(geom::Size, geom::PixelFormat, mga::BufferUsage));
+        std::shared_ptr<mg::Buffer>(geom::Size, MirPixelFormat, mga::BufferUsage));
 };
 
 struct MockResourceFactory: public mga::DisplayResourceFactory

=== modified file 'tests/unit-tests/graphics/android/test_pixel_format.cpp'
--- tests/unit-tests/graphics/android/test_pixel_format.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_pixel_format.cpp	2013-12-02 16:56:54 +0000
@@ -21,22 +21,21 @@
 #include <gtest/gtest.h>
 
 namespace mga=mir::graphics::android;
-namespace geom=mir::geometry;
 
 TEST(PixelFormatConversion, conversion_to_android_test)
 {
-    EXPECT_EQ(HAL_PIXEL_FORMAT_RGBA_8888, mga::to_android_format(geom::PixelFormat::abgr_8888));
-    EXPECT_EQ(HAL_PIXEL_FORMAT_RGBX_8888, mga::to_android_format(geom::PixelFormat::xbgr_8888));
-    EXPECT_EQ(HAL_PIXEL_FORMAT_BGRA_8888, mga::to_android_format(geom::PixelFormat::argb_8888));
+    EXPECT_EQ(HAL_PIXEL_FORMAT_RGBA_8888, mga::to_android_format(mir_pixel_format_abgr_8888));
+    EXPECT_EQ(HAL_PIXEL_FORMAT_RGBX_8888, mga::to_android_format(mir_pixel_format_xbgr_8888));
+    EXPECT_EQ(HAL_PIXEL_FORMAT_BGRA_8888, mga::to_android_format(mir_pixel_format_argb_8888));
     //note X to A conversion!
-    EXPECT_EQ(HAL_PIXEL_FORMAT_BGRA_8888, mga::to_android_format(geom::PixelFormat::xrgb_8888));
-    EXPECT_EQ(HAL_PIXEL_FORMAT_RGB_888, mga::to_android_format(geom::PixelFormat::bgr_888));
+    EXPECT_EQ(HAL_PIXEL_FORMAT_BGRA_8888, mga::to_android_format(mir_pixel_format_xrgb_8888));
+    EXPECT_EQ(HAL_PIXEL_FORMAT_RGB_888, mga::to_android_format(mir_pixel_format_bgr_888));
 }
 
 TEST(PixelFormatConversion, conversion_to_mir_test)
 {
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGBA_8888));
-    EXPECT_EQ(geom::PixelFormat::xbgr_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGBX_8888));
-    EXPECT_EQ(geom::PixelFormat::argb_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_BGRA_8888));
-    EXPECT_EQ(geom::PixelFormat::bgr_888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGB_888));
+    EXPECT_EQ(mir_pixel_format_abgr_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGBA_8888));
+    EXPECT_EQ(mir_pixel_format_xbgr_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGBX_8888));
+    EXPECT_EQ(mir_pixel_format_argb_8888, mga::to_mir_format(HAL_PIXEL_FORMAT_BGRA_8888));
+    EXPECT_EQ(mir_pixel_format_bgr_888, mga::to_mir_format(HAL_PIXEL_FORMAT_RGB_888));
 }

=== modified file 'tests/unit-tests/graphics/android/test_server_interpreter.cpp'
--- tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-12-02 16:56:54 +0000
@@ -48,7 +48,7 @@
         mock_fb_bundle = std::make_shared<NiceMock<mtd::MockFBBundle>>();
         mock_cache = std::make_shared<NiceMock<mtd::MockInterpreterResourceCache>>();
         ON_CALL(*mock_fb_bundle, fb_format())
-            .WillByDefault(Return(geom::PixelFormat::abgr_8888));
+            .WillByDefault(Return(mir_pixel_format_abgr_8888));
     }
 
     std::shared_ptr<mtd::MockBuffer> mock_buffer1;
@@ -118,7 +118,7 @@
 
     EXPECT_CALL(*mock_fb_bundle, fb_format())
         .Times(1)
-        .WillOnce(Return(geom::PixelFormat::abgr_8888));
+        .WillOnce(Return(mir_pixel_format_abgr_8888));
 
     mga::ServerRenderWindow render_window(mock_fb_bundle, mock_cache);
 

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -56,7 +56,7 @@
         fake_devices.add_standard_drm_devices();
 
         size = geom::Size{300, 200};
-        pf = geom::PixelFormat::argb_8888;
+        pf = mir_pixel_format_argb_8888;
         stride = geom::Stride{4 * size.width.as_uint32_t()};
         usage = mg::BufferUsage::hardware;
         buffer_properties = mg::BufferProperties{size, pf, usage};
@@ -88,7 +88,7 @@
     std::unique_ptr<mgg::BufferAllocator> allocator;
 
     // Defaults
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Size size;
     geom::Stride stride;
     mg::BufferUsage usage;

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-12-02 16:56:54 +0000
@@ -56,7 +56,7 @@
         fake_devices.add_standard_drm_devices();
 
         size = geom::Size{300, 200};
-        pf = geom::PixelFormat::argb_8888;
+        pf = mir_pixel_format_argb_8888;
         usage = mg::BufferUsage::hardware;
         buffer_properties = mg::BufferProperties{size, pf, usage};
 
@@ -71,7 +71,7 @@
 
     // Defaults
     geom::Size size;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     mg::BufferUsage usage;
     mg::BufferProperties buffer_properties;
 
@@ -101,7 +101,7 @@
     EXPECT_CALL(mock_gbm, gbm_bo_destroy(_));
 
     const mg::BufferProperties properties(geom::Size{1280, 800},
-                                          geom::PixelFormat::argb_8888,
+                                          mir_pixel_format_argb_8888,
                                           mg::BufferUsage::hardware);
 
     auto buf = allocator->alloc_buffer(properties);
@@ -116,7 +116,7 @@
     EXPECT_CALL(mock_gbm, gbm_bo_destroy(_));
 
     const mg::BufferProperties properties(geom::Size{100, 100},
-                                          geom::PixelFormat::argb_8888,
+                                          mir_pixel_format_argb_8888,
                                           mg::BufferUsage::hardware);
 
     auto buf = allocator->alloc_buffer(properties);
@@ -129,7 +129,7 @@
     using namespace testing;
 
     const mg::BufferProperties properties(geom::Size{1920, 1200},
-                                          geom::PixelFormat::argb_8888,
+                                          mir_pixel_format_argb_8888,
                                           mg::BufferUsage::software);
 
     auto buf = allocator->alloc_buffer(properties);
@@ -144,7 +144,7 @@
     EXPECT_CALL(mock_gbm, gbm_bo_destroy(_));
 
     const mg::BufferProperties properties(geom::Size{1280, 800},
-                                          geom::PixelFormat::argb_8888,
+                                          mir_pixel_format_argb_8888,
                                           mg::BufferUsage::hardware);
 
     setenv("MIR_BYPASS", "0", 1);
@@ -163,7 +163,7 @@
     EXPECT_CALL(mock_gbm, gbm_bo_create(_,_,_,GBM_FORMAT_ARGB8888,_));
     EXPECT_CALL(mock_gbm, gbm_bo_destroy(_));
 
-    allocator->alloc_buffer(mg::BufferProperties{size, geom::PixelFormat::argb_8888, usage});
+    allocator->alloc_buffer(mg::BufferProperties{size, mir_pixel_format_argb_8888, usage});
 }
 
 TEST_F(GBMBufferAllocatorTest, correct_buffer_format_translation_xrgb_8888)
@@ -173,7 +173,7 @@
     EXPECT_CALL(mock_gbm, gbm_bo_create(_,_,_,GBM_FORMAT_XRGB8888,_));
     EXPECT_CALL(mock_gbm, gbm_bo_destroy(_));
 
-    allocator->alloc_buffer(mg::BufferProperties{size, geom::PixelFormat::xrgb_8888, usage});
+    allocator->alloc_buffer(mg::BufferProperties{size, mir_pixel_format_xrgb_8888, usage});
 }
 
 MATCHER_P(has_flag_set, flag, "")
@@ -280,11 +280,11 @@
 
     auto argb_8888_count = std::count(supported_pixel_formats.begin(),
                                       supported_pixel_formats.end(),
-                                      geom::PixelFormat::argb_8888);
+                                      mir_pixel_format_argb_8888);
 
     auto xrgb_8888_count = std::count(supported_pixel_formats.begin(),
                                       supported_pixel_formats.end(),
-                                      geom::PixelFormat::xrgb_8888);
+                                      mir_pixel_format_xrgb_8888);
 
     EXPECT_EQ(1, argb_8888_count);
     EXPECT_EQ(1, xrgb_8888_count);
@@ -295,7 +295,7 @@
     auto supported_pixel_formats = allocator->supported_pixel_formats();
 
     ASSERT_FALSE(supported_pixel_formats.empty());
-    EXPECT_EQ(geom::PixelFormat::argb_8888, supported_pixel_formats[0]);
+    EXPECT_EQ(mir_pixel_format_argb_8888, supported_pixel_formats[0]);
 }
 
 TEST_F(GBMBufferAllocatorTest, alloc_with_unsupported_pixel_format_throws)
@@ -306,6 +306,6 @@
     EXPECT_CALL(mock_gbm, gbm_bo_create(_,_,_,_,_)).Times(0);
 
     EXPECT_THROW({
-        allocator->alloc_buffer(mg::BufferProperties{size, geom::PixelFormat::abgr_8888, usage});
+        allocator->alloc_buffer(mg::BufferProperties{size, mir_pixel_format_abgr_8888, usage});
     }, std::runtime_error);
 }

=== modified file 'tests/unit-tests/graphics/gbm/test_internal_native_display.cpp'
--- tests/unit-tests/graphics/gbm/test_internal_native_display.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/gbm/test_internal_native_display.cpp	2013-12-02 16:56:54 +0000
@@ -85,12 +85,3 @@
     EXPECT_THAT(test_package, PackageMatches(platform_package));
 }
 
-TEST(MirServerMesaEGLNativeDisplayInvariants, pixel_format_formats_are_castable)
-{
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::invalid), mir_pixel_format_invalid);
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::abgr_8888), mir_pixel_format_abgr_8888);
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::xbgr_8888), mir_pixel_format_xbgr_8888);
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::argb_8888), mir_pixel_format_argb_8888);
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::xrgb_8888), mir_pixel_format_xrgb_8888);
-    EXPECT_EQ(static_cast<MirPixelFormat>(geom::PixelFormat::bgr_888), mir_pixel_format_bgr_888);
-}

=== modified file 'tests/unit-tests/graphics/gbm/test_shm_buffer.cpp'
--- tests/unit-tests/graphics/gbm/test_shm_buffer.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/gbm/test_shm_buffer.cpp	2013-12-02 16:56:54 +0000
@@ -45,14 +45,14 @@
 {
     ShmBufferTest()
         : size{150,340},
-          pixel_format{geom::PixelFormat::bgr_888},
+          pixel_format{mir_pixel_format_bgr_888},
           stub_shm_file{std::make_shared<StubShmFile>()},
           shm_buffer{stub_shm_file, size, pixel_format}
     {
     }
 
     geom::Size const size;
-    geom::PixelFormat const pixel_format;
+    MirPixelFormat const pixel_format;
     std::shared_ptr<StubShmFile> const stub_shm_file;
     mgg::ShmBuffer shm_buffer;
     testing::NiceMock<mtd::MockGL> mock_gl;
@@ -62,7 +62,7 @@
 
 TEST_F(ShmBufferTest, has_correct_properties)
 {
-    size_t const bytes_per_pixel{geom::bytes_per_pixel(pixel_format)};
+    size_t const bytes_per_pixel = MIR_BYTES_PER_PIXEL(pixel_format);
     size_t const expected_stride{bytes_per_pixel * size.width.as_uint32_t()};
 
     EXPECT_EQ(size, shm_buffer.size());
@@ -72,7 +72,7 @@
 
 TEST_F(ShmBufferTest, native_buffer_contains_correct_data)
 {
-    size_t const bytes_per_pixel{geom::bytes_per_pixel(pixel_format)};
+    size_t const bytes_per_pixel = MIR_BYTES_PER_PIXEL(pixel_format);
     size_t const expected_stride{bytes_per_pixel * size.width.as_uint32_t()};
 
     auto native_buffer = shm_buffer.native_buffer_handle();

=== modified file 'tests/unit-tests/graphics/test_buffer_properties.cpp'
--- tests/unit-tests/graphics/test_buffer_properties.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/graphics/test_buffer_properties.cpp	2013-12-02 16:56:54 +0000
@@ -27,7 +27,7 @@
 TEST(buffer_properties, default_create)
 {
     geom::Size size;
-    geom::PixelFormat pixel_format{geom::PixelFormat::invalid};
+    MirPixelFormat pixel_format{mir_pixel_format_invalid};
     mg::BufferUsage usage{mg::BufferUsage::undefined};
 
     mg::BufferProperties prop;
@@ -40,7 +40,7 @@
 TEST(buffer_properties, custom_create)
 {
     geom::Size size{66, 166};
-    geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888};
+    MirPixelFormat pixel_format{mir_pixel_format_abgr_8888};
     mg::BufferUsage usage{mg::BufferUsage::hardware};
 
     mg::BufferProperties prop{size, pixel_format, usage};
@@ -53,7 +53,7 @@
 TEST(buffer_properties, equal_properties_test_equal)
 {
     geom::Size size{66, 166};
-    geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888};
+    MirPixelFormat pixel_format{mir_pixel_format_abgr_8888};
     mg::BufferUsage usage{mg::BufferUsage::hardware};
 
     mg::BufferProperties prop0{size, pixel_format, usage};
@@ -73,10 +73,10 @@
         {geom::Width{67}, geom::Height{166}}
     };
 
-    geom::PixelFormat pixel_format[2] =
+    MirPixelFormat pixel_format[2] =
     {
-        geom::PixelFormat::abgr_8888,
-        geom::PixelFormat::bgr_888
+        mir_pixel_format_abgr_8888,
+        mir_pixel_format_bgr_888
     };
 
     mg::BufferUsage usage[2] =

=== modified file 'tests/unit-tests/graphics/test_default_display_configuration_policy.cpp'
--- tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2013-11-25 07:59:56 +0000
+++ tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2013-12-02 16:56:54 +0000
@@ -41,7 +41,7 @@
                 card_id,
                 mg::DisplayConfigurationOutputType::vga,
                 {
-                    geom::PixelFormat::abgr_8888
+                    mir_pixel_format_abgr_8888
                 },
                 {
                     {geom::Size{123, 111}, 59.9},
@@ -81,7 +81,7 @@
                 card_id,
                 mg::DisplayConfigurationOutputType::vga,
                 {
-                    geom::PixelFormat::abgr_8888
+                    mir_pixel_format_abgr_8888
                 },
                 {
                     {geom::Size{523, 555}, 60.0},
@@ -102,7 +102,7 @@
                 card_id,
                 mg::DisplayConfigurationOutputType::vga,
                 {
-                    geom::PixelFormat::abgr_8888
+                    mir_pixel_format_abgr_8888
                 },
                 {},
                 0,

=== modified file 'tests/unit-tests/graphics/test_display_configuration.cpp'
--- tests/unit-tests/graphics/test_display_configuration.cpp	2013-09-12 21:36:55 +0000
+++ tests/unit-tests/graphics/test_display_configuration.cpp	2013-12-02 16:56:54 +0000
@@ -32,7 +32,7 @@
     mg::DisplayConfigurationCardId{2},
     mg::DisplayConfigurationOutputType::dvid,
     {
-        geom::PixelFormat::abgr_8888
+        mir_pixel_format_abgr_8888
     },
     {
         {geom::Size{10, 20}, 60.0},

=== modified file 'tests/unit-tests/graphics/test_graphics_platform.cpp'
--- tests/unit-tests/graphics/test_graphics_platform.cpp	2013-11-28 14:17:01 +0000
+++ tests/unit-tests/graphics/test_graphics_platform.cpp	2013-12-02 16:56:54 +0000
@@ -126,7 +126,7 @@
     ASSERT_NE(0u, supported_pixel_formats.size());
 
     geom::Size size{320, 240};
-    geom::PixelFormat const pf{supported_pixel_formats[0]};
+    MirPixelFormat const pf{supported_pixel_formats[0]};
     mg::BufferUsage usage{mg::BufferUsage::hardware};
     mg::BufferProperties buffer_properties{size, pf, usage};
 

=== modified file 'tests/unit-tests/scene/test_surface.cpp'
--- tests/unit-tests/scene/test_surface.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/scene/test_surface.cpp	2013-12-02 16:56:54 +0000
@@ -63,7 +63,7 @@
     EXPECT_EQ(Height(0), params.size.height);
     EXPECT_EQ(default_point, params.top_left);
     EXPECT_EQ(mg::BufferUsage::undefined, params.buffer_usage);
-    EXPECT_EQ(geom::PixelFormat::invalid, params.pixel_format);
+    EXPECT_EQ(mir_pixel_format_invalid, params.pixel_format);
 
     EXPECT_EQ(msh::a_surface(), params);
 }
@@ -73,7 +73,7 @@
     using namespace geom;
     Size const size{1024, 768};
     mg::BufferUsage const usage{mg::BufferUsage::hardware};
-    geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
+    MirPixelFormat const format{mir_pixel_format_abgr_8888};
     std::string name{"surface"};
 
     auto params = msh::a_surface().of_name(name)
@@ -92,7 +92,7 @@
     using namespace geom;
     Size const size{1024, 768};
     mg::BufferUsage const usage{mg::BufferUsage::hardware};
-    geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
+    MirPixelFormat const format{mir_pixel_format_abgr_8888};
 
     auto params0 = msh::a_surface().of_name("surface")
                                   .of_size(size)
@@ -118,8 +118,8 @@
     std::vector<mg::BufferUsage> const usages{mg::BufferUsage::hardware,
                                               mg::BufferUsage::software};
 
-    std::vector<geom::PixelFormat> const formats{geom::PixelFormat::abgr_8888,
-                                                 geom::PixelFormat::bgr_888};
+    std::vector<MirPixelFormat> const formats{mir_pixel_format_abgr_8888,
+                                                 mir_pixel_format_bgr_888};
 
     std::vector<msh::SurfaceCreationParameters> params_vec;
 
@@ -161,7 +161,7 @@
         using namespace testing;
 
         surface_name = "test_surfaceA";
-        pf = geom::PixelFormat::abgr_8888;
+        pf = mir_pixel_format_abgr_8888;
         size = geom::Size{43, 420};
         rect = geom::Rectangle{geom::Point{geom::X{0}, geom::Y{0}}, size};
         stride = geom::Stride{4 * size.width.as_uint32_t()};
@@ -179,7 +179,7 @@
     std::shared_ptr<mtd::MockSurfaceState> mock_basic_state;
     std::string surface_name;
     std::shared_ptr<testing::NiceMock<mtd::MockBufferStream>> mock_buffer_stream;
-    geom::PixelFormat pf;
+    MirPixelFormat pf;
     geom::Stride stride;
     geom::Size size;
     geom::Rectangle rect;

=== modified file 'tests/unit-tests/scene/test_surface_impl.cpp'
--- tests/unit-tests/scene/test_surface_impl.cpp	2013-11-27 12:28:24 +0000
+++ tests/unit-tests/scene/test_surface_impl.cpp	2013-12-02 16:56:54 +0000
@@ -147,7 +147,7 @@
         using namespace testing;
 
         ON_CALL(*buffer_stream, stream_size()).WillByDefault(Return(geom::Size()));
-        ON_CALL(*buffer_stream, get_stream_pixel_format()).WillByDefault(Return(geom::PixelFormat::abgr_8888));
+        ON_CALL(*buffer_stream, get_stream_pixel_format()).WillByDefault(Return(mir_pixel_format_abgr_8888));
         ON_CALL(*buffer_stream, swap_client_buffers(_)).WillByDefault(SetArg<0>(std::shared_ptr<mtd::StubBuffer>()));
     }
     mf::SurfaceId stub_id;