Merge lp:~mir-team/mir/trunk-0.1.6 into lp:mir/0.1

[kevin gunn]

Latest upstream release of Mir 0.1.6 (lp:~mir-team/mir/development-branch r1433)

[Daniel van Vugt (vanvugt)]

The diff to tagged release 0.1.6 is good. Only changelog differs.

Only mentions of last minute bugs are missing from changelog:
  bug 1285955
  bug 1207312

I would also recommend not cluttering the changelog with details of internal changes that users of Mir won't ever need to understand. e.g. All but one of these are meaningless to the public Mir SDK so should not be mentioned;

396 + - config, frontend: remove force_threads_to_unblock_callback()
397 + - Protect input region member of surface data, hold mutex to access
398 + hidden member.
399 + - config: ConfigurationOptions::default_ipc_threads can be a constant.
400 + - debian: Provide platform packages managed with dpkg alternatives.
401 + - Add the ability to load device traces, both udev and ioctls, in the
402 + UdevEnvironment test helper.
403 + - test_client_input.cpp: Remove unused global "mir_test_socket".
404 + - Sundry improvements to mir::udev.

That's not all. I just picked it as an example. Only line 400 would qualify as meaningful to anyone else, so release notable.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/mir-ci/1638/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/36/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/36/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/mir-ci/1639/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/37/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/37/console

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

review: Needs Fixing (continuous-integration)

[kevin gunn (kgunn72)]

wasn't sure to include bug 1285955 as fixed, as the mp is more of a temp workaround - but i'll include that.

I'm torn about condensing the changelog - i prefer the detail. But, happy to conform to convention.
I'll take one more scrub, but then let's move on getting this in.

> The diff to tagged release 0.1.6 is good. Only changelog differs.
>
> Only mentions of last minute bugs are missing from changelog:
> bug 1285955
> bug 1207312
>
> I would also recommend not cluttering the changelog with details of internal
> changes that users of Mir won't ever need to understand. e.g. All but one of
> these are meaningless to the public Mir SDK so should not be mentioned;
>
> 396 + - config, frontend: remove force_threads_to_unblock_callback()
> 397 + - Protect input region member of surface data, hold mutex to
> access
> 398 + hidden member.
> 399 + - config: ConfigurationOptions::default_ipc_threads can be a
> constant.
> 400 + - debian: Provide platform packages managed with dpkg
> alternatives.
> 401 + - Add the ability to load device traces, both udev and ioctls, in
> the
> 402 + UdevEnvironment test helper.
> 403 + - test_client_input.cpp: Remove unused global "mir_test_socket".
> 404 + - Sundry improvements to mir::udev.
>
> That's not all. I just picked it as an example. Only line 400 would qualify as
> meaningful to anyone else, so release notable.

[kevin gunn (kgunn72)]

Did you test your feature/code change/bug fix ? what device(s) ?
dev branch ci testing across i386, amd64 & arm/nexus4

Did you break mir server API or ABI and have the relevant bumps to .so and debian docs been made ?
yes - libmirserver, updates have been made

Did you break mir client API or ABI and have you followed up with the known clients & announced on mir-devel mailing list ?
yes

Don't forget to check on Xorg in the case of client API break
does not break Xorg/xmir

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/mir-ci/1640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/38/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/38/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1438
http://jenkins.qa.ubuntu.com/job/mir-ci/1641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/39/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/39/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

For bug 1285955 the "workaround" is the closest thing to a fix the Mir project will ever need. So that's definitely Fix Released for Mir in 0.1.6.

[Daniel van Vugt (vanvugt)]

I think the last commit should be reverted ("updated snapshot from mir-devel r1441"). Mir 0.1.6 is r1433. Nothing newer than that should be included until it's cooled down a bit as part of the 0.1.7 cycle.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

The post-0.1.6 changes I intentionally kept out of 0.1.6 because they're large and still carry some risk. So I'll keep those back to the 0.1.7 release.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1439
http://jenkins.qa.ubuntu.com/job/mir-ci/1642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1099/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/40/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/40/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I don't quite understand how CI approved the same code (repeatedly) in development-branch but it doesn't pass here. I can only imagine it's CI that changed.

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

The first Jenkins failure is bug 1287600. A fix has now been proposed for that :P

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1440
http://jenkins.qa.ubuntu.com/job/mir-ci/1643/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/41/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/41/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1443
http://jenkins.qa.ubuntu.com/job/mir-ci/1645/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/43/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/43/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Cleaned up. Now the branch contains exactly what the changelog says:

Mir 0.1.6
+ Two cherry picks from Mir 0.1.7 (one enhancement + one bug fix)
+ changelog additions.

review: Approve

[Daniel van Vugt (vanvugt)]

We should stop adding bits of Mir 0.1.7. There are large changes post-0.1.6 (that I wrote even) and it's safest if we let them cool down and mature some more over the weeks before entering distro.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1445
http://jenkins.qa.ubuntu.com/job/mir-ci/1646/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/44/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/44/console

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

review: Needs Fixing (continuous-integration)

[kevin gunn (kgunn72)]

you should not be landing anything on devel you would not instantly want in archive.
devel has been treated as sacred, devel was only created as a barrier for server changes. if you need to mature items, keep a feature branch and ask for testing help.

> We should stop adding bits of Mir 0.1.7. There are large changes post-0.1.6
> (that I wrote even) and it's safest if we let them cool down and mature some
> more over the weeks before entering distro.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1446
http://jenkins.qa.ubuntu.com/job/mir-ci/1647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/45/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Feature branches are the opposite of maturing code. In a feature branch, no one other than the author is using it on a daily basis. So the maturation (testing by multiple people) never even begins.

[Daniel van Vugt (vanvugt)]

The diff still looks correct, and accurately reflected in debian/changelog.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-06 17:55:08 +0000
+++ CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -28,9 +28,14 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 1)
-set(MIR_VERSION_PATCH 5)
+set(MIR_VERSION_PATCH 6)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+execute_process(
+  COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
+  OUTPUT_VARIABLE TARGET_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
 option(use_debflags "Use build flags from dpkg-buildflags." OFF)
 if(use_debflags)
@@ -87,15 +92,28 @@
 )
 endif(MIR_DISABLE_EPOLL_REACTOR)
 
+add_definitions(-DMESA_EGL_NO_X11_HEADERS)
+
 # Default to mesa backend
 set(
   MIR_PLATFORM
   mesa
   CACHE
   STRING
-  "graphics backend to build (options are 'mesa' or 'android')"
+  "a list of graphics backends to build (options are 'mesa' or 'android')"
 )
 
+list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
+
+foreach(platform IN LISTS MIR_PLATFORM)
+  if (platform STREQUAL "mesa")
+    set(MIR_BUILD_PLATFORM_MESA TRUE)
+  endif()
+  if (platform STREQUAL "android")
+     set(MIR_BUILD_PLATFORM_ANDROID TRUE)
+  endif()
+endforeach(platform)
+
 find_package(EGL REQUIRED)
 find_package(GLESv2 REQUIRED)
 find_package(GLM REQUIRED)
@@ -110,24 +128,14 @@
 include_directories (${EGL_INCLUDE_DIRS})
 include_directories (${GLM_INCLUDE_DIRS})
 
-if (MIR_PLATFORM STREQUAL "android")
-
-  #android headers use 'int foo[0]' as struct members
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
-
-  add_definitions( -DANDROID )
- 
+if (MIR_BUILD_PLATFORM_ANDROID)
   find_package(LibHardware REQUIRED)
+endif()
 
-  #ctest does not work for android, so turn test discovery off
-  set(DISABLE_GTEST_TEST_DISCOVERY ON)
-elseif (MIR_PLATFORM STREQUAL "mesa")
+if (MIR_BUILD_PLATFORM_MESA)
   find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__GBM__")
-else ()
-  message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'mesa'")
 endif()
 
 set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input

=== modified file 'cmake/FindXKBCOMMON.cmake'
--- cmake/FindXKBCOMMON.cmake	2013-04-10 18:09:31 +0000
+++ cmake/FindXKBCOMMON.cmake	2014-03-06 14:19:43 +0000
@@ -3,13 +3,8 @@
 find_path(XKBCOMMON_INCLUDE_DIR xkbcommon/xkbcommon.h
           HINTS ${PC_XKBCOMMON_INCLUDEDIR} ${PC_XKBCOMMON_INCLUDE_DIRS})
 
-if (MIR_PLATFORM STREQUAL "android")
-find_library(XKBCOMMON_LIBRARY libxkbcommon.so
-             HINTS /usr/lib/arm-linux-gnueabihf/)
-else()
 find_library(XKBCOMMON_LIBRARY xkbcommon
              HINTS ${PC_XKBCOMMON_LIBDIR} ${PC_XKBCOMMON_LIBRARY_DIRS})
-endif()
 
 set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LIBRARY})
 set(XKBCOMMON_INCLUDE_DIRS ${XKBCOMMON_INCLUDE_DIR})
@@ -20,4 +15,4 @@
 find_package_handle_standard_args(XKBCOMMON  DEFAULT_MSG
                                   XKBCOMMON_LIBRARY XKBCOMMON_INCLUDE_DIR)
 
-mark_as_advanced(XKBCOMMON_INCLUDE_DIR XKBCOMMON_LIBRARY)
\ No newline at end of file
+mark_as_advanced(XKBCOMMON_INCLUDE_DIR XKBCOMMON_LIBRARY)

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2014-01-16 04:00:01 +0000
+++ cmake/MirCommon.cmake	2014-03-06 14:19:43 +0000
@@ -22,15 +22,12 @@
     valgrind)
 
   if(VALGRIND_EXECUTABLE)
-    if(MIR_PLATFORM STREQUAL "android")
-	  # don't exit with an error when valgrind find errors
-      #set(VALGRIND_ARGS "--error-exitcode=1")
-    else()
-      set(VALGRIND_ARGS "--error-exitcode=1 --trace-children=yes")
+    set(VALGRIND_ARGS "--error-exitcode=1" "--trace-children=yes")
+    set(DISCOVER_FLAGS "--enable-memcheck")
+    if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
+        set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
+        set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
     endif()
-
-    set(ENABLE_MEMCHECK_FLAG "--enable-memcheck")
-
   else(VALGRIND_EXECUTABLE)
     message("Not enabling memcheck as valgrind is missing on your system")
   endif(VALGRIND_EXECUTABLE)
@@ -63,7 +60,7 @@
 
     add_custom_target(
       ${TEST_DISCOVERY_TARGET_NAME} ALL
-      ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} --gtest_list_tests | ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} ${ENABLE_MEMCHECK_FLAG}
+      ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} --gtest_list_tests | ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} ${DISCOVER_FLAGS}
       ${EXTRA_ENV_FLAGS}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       COMMENT "Discovering Tests in ${EXECUTABLE}" VERBATIM)
@@ -89,7 +86,7 @@
       else()
         add_custom_target(
           memcheck_test ALL
-          ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error --memcheck-test
+          ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error --memcheck-test ${DISCOVER_FLAGS}
           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
           COMMENT "Adding memcheck test" VERBATIM)
 

=== modified file 'cmake/src/mir/mir_discover_gtest_tests.cpp'
--- cmake/src/mir/mir_discover_gtest_tests.cpp	2013-07-01 06:29:43 +0000
+++ cmake/src/mir/mir_discover_gtest_tests.cpp	2014-03-06 14:19:43 +0000
@@ -58,26 +58,34 @@
     return pattern;
 }
 
-vector<string> valgrind_cmd_patterns()
+vector<string> valgrind_cmd_patterns(vector<string> const& suppressions)
 {
     vector<string> patterns{
         "valgrind",
         "--error-exitcode=1",
-        "--trace-children=yes",
+        "--trace-children=yes"
+    };
+
+    for (auto const& sup : suppressions)
+        patterns.push_back(std::string("--suppressions=") + sup);
+
+    vector<string> gtest_patterns{
         "%s",
         "--gtest_death_test_use_fork",
         "--gtest_filter=%s"
     };
 
+    patterns.insert(patterns.end(), gtest_patterns.begin(), gtest_patterns.end());
+
     return patterns;
 }
 
-string memcheck_cmd_line_pattern()
+string memcheck_cmd_line_pattern(vector<string> const& suppressions)
 {
     stringstream ss;
 
     ss << "ADD_TEST(\"memcheck(%s.%s)\"";
-    for (auto& s : valgrind_cmd_patterns())
+    for (auto& s : valgrind_cmd_patterns(suppressions))
         ss << " \"" << s << "\"";
     ss << ")" << endl;
 
@@ -112,6 +120,7 @@
     bool enable_memcheck;
     bool memcheck_test;
     std::vector<std::pair<std::string, std::string>> extra_environment;
+    std::vector<std::string> suppressions;
 };
 
 bool parse_configuration_from_cmd_line(int argc, char** argv, Configuration& config)
@@ -121,6 +130,7 @@
         {"enable-memcheck", no_argument, 0, 0},
         {"memcheck-test", no_argument, 0, 0},
         {"add-environment", required_argument, 0, 0},
+        {"suppressions", required_argument, 0, 0},
         {0, 0, 0, 0}
     };
 
@@ -161,17 +171,21 @@
                 return false;
             config.extra_environment.push_back(std::make_pair(std::string(optarg, equal_pos - optarg), std::string(equal_pos + 1)));
         }
+        else if (!strcmp(optname, "suppressions"))
+        {
+            config.suppressions.push_back(std::string(optarg));
+        }
     }
 
     return true;
 }
 
-string prepareMemcheckTestLine(string const& exe)
+string prepareMemcheckTestLine(string const& exe, vector<string> const& suppressions)
 {
     stringstream ss;
 
     ss << "ADD_TEST(\"memcheck-test\" \"sh\" \"-c\" \"";
-    for (auto& s : valgrind_cmd_patterns())
+    for (auto& s : valgrind_cmd_patterns(suppressions))
         ss << s << " ";
     ss << "; if [ $? != 0 ]; then exit 0; else exit 1; fi\")";
 
@@ -186,13 +200,13 @@
     return cmd_line;
 }
 
-void emitMemcheckTest(string const& exe)
+void emitMemcheckTest(string const& exe, vector<string> const& suppressions)
 {
     ifstream CTestTestfile("CTestTestfile.cmake", ifstream::in);
     bool need_memcheck_test = true;
     string line;
 
-    string memcheckTestLine = prepareMemcheckTestLine(exe);
+    string memcheckTestLine = prepareMemcheckTestLine(exe, suppressions);
 
     if (CTestTestfile.is_open())
     {
@@ -238,7 +252,7 @@
 
     if (config.memcheck_test)
     {
-        emitMemcheckTest(config.executable);
+        emitMemcheckTest(config.executable, config.suppressions);
         return 0;
     }
 
@@ -277,7 +291,7 @@
             snprintf(
                 cmd_line,
                 sizeof(cmd_line),
-                config.enable_memcheck ? memcheck_cmd_line_pattern().c_str() :
+                config.enable_memcheck ? memcheck_cmd_line_pattern(config.suppressions).c_str() :
                                          ordinary_cmd_line_pattern().c_str(),
                 test_suite.c_str(),
                 elide_string_left(*test, output_width/2).c_str(),

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2014-01-22 08:32:55 +0000
+++ cross-compile-chroot.sh	2014-03-06 14:19:43 +0000
@@ -1,27 +1,69 @@
 #!/bin/bash
-# build script for Mir on android arm devices
+# build script to compile Mir for armhf devices
 #
 set -e
 
+usage() {
+  echo "usage: $(basename $0) [-c] [-u]"
+  echo "-c clean before building"
+  echo "-u update partial chroot directory"
+  echo "-h this message"
+}
+
+clean_build_dir() {
+    rm -rf ${1}
+    mkdir ${1}
+}
+
 BUILD_DIR=build-android-arm
-NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
-
-if [ "$MIR_NDK_PATH" = "" ]; then
-    export MIR_NDK_PATH=`pwd`/partial-armhf-chroot
-    if [ ! -d ${MIR_NDK_PATH} ]; then 
-        echo "no partial root specified or detected. attempting to create one"
-    fi
-fi
-
-pushd tools > /dev/null
-    ./setup-partial-armhf-chroot.sh ${MIR_NDK_PATH}
-popd > /dev/null
-
-echo "Using MIR_NDK_PATH: $MIR_NDK_PATH"
-
-#start with a clean build every time
-rm -rf ${BUILD_DIR}
-mkdir ${BUILD_DIR}
+NUM_JOBS=$(( $(grep -c ^processor /proc/cpuinfo) + 1 ))
+_do_update_chroot=0
+
+while getopts "cuh" OPTNAME
+do
+    case $OPTNAME in
+      c )
+        clean_build_dir ${BUILD_DIR}
+        ;;
+      u )
+        _do_update_chroot=1
+        ;;
+      h )
+        usage
+        exit 0
+        ;;
+      * )
+        echo "invalid option specified"
+        usage
+        exit 1
+        ;;
+    esac
+done
+
+
+if [ "${MIR_NDK_PATH}" = "" ]; then
+    export MIR_NDK_PATH=$(pwd)/partial-armhf-chroot
+fi
+
+if [ ! -d ${MIR_NDK_PATH} ]; then 
+    echo "no partial chroot dir detected. attempting to create one"
+    _do_update_chroot=1
+fi
+
+if [ ! -d ${BUILD_DIR} ]; then 
+    mkdir ${BUILD_DIR}
+fi
+
+if [ ${_do_update_chroot} -eq 1 ] ; then
+    pushd tools > /dev/null
+        ./setup-partial-armhf-chroot.sh ${MIR_NDK_PATH}
+    popd > /dev/null
+    # force a clean build after an update, since CMake cache maybe out of date
+    clean_build_dir ${BUILD_DIR}
+fi
+
+echo "Using MIR_NDK_PATH: ${MIR_NDK_PATH}"
+
 pushd ${BUILD_DIR} > /dev/null 
 
     export PKG_CONFIG_PATH="${MIR_NDK_PATH}/usr/lib/pkgconfig:${MIR_NDK_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig"
@@ -33,9 +75,9 @@
     echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DBoost_COMPILER=-gcc \
-      -DMIR_PLATFORM=android \
+      -DMIR_PLATFORM=android\;mesa \
       .. 
 
-    cmake --build . -- -j${NUM_JOBS}
+    make -j${NUM_JOBS}
 
-popd ${BUILD_DIR} > /dev/null 
+popd > /dev/null 

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-12 18:29:30 +0000
+++ debian/changelog	2014-03-06 14:19:43 +0000
@@ -1,3 +1,71 @@
+mir (0.1.6-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Cherry-picked from future release 0.1.7:
+    - Enhancement: options: Make it easier to customize DefaultConfiguration
+    - Bug fix: Don't pass a parameter to bash's popd command. It doesn't expect
+      one and will return an error from cross-compile-chroot.sh. (LP: #1287600)
+  * New upstream release 0.1.6 (https://launchpad.net/mir/+milestone/0.1.6)
+    - mirserver ABI bumped to 16.
+    - Server API changes:
+      . Report classes have moved to new namespaces/components. Please
+        consult the server headers.
+      . General clean-ups and virtual function changes affecting the ABI
+        (a rebuild is required for all shells).
+    - mirclient ABI unchanged, still at 7. Clients do not need rebuilding.
+    - Add new feature: Screen recording ("screencasting") as demonstrated by
+      the new mir-util "mirscreencast".
+    - debian: Provide platform packages managed with dpkg alternatives.
+    - Add new valgrind suppressions (mostly for armhf right now)
+    - tools: Add new libmirclientplatform.so to install_on_android.sh.
+    - Add "mir_demo_standalone_render_overlays", which is a free-standing
+      example of overlay support.
+    - Proper DisplayConfiguration for the AndroidDisplay to be better 
+      prepared for multi-monitor Android.
+    - Commenced/continued simplifying the surface class hierarchy: BasicSurface
+      has now absorbed SurfaceData.
+    - Dynamically load the client platform library.
+    - Bugs fixed:
+      . Exceptions thrown from within compositing threads were untraceable,
+        resulting in a bunch of undebuggable crash reports (LP: #1237332)
+      . Ensure we close drm device file descriptors on exec. (LP: #1284081)
+      . nested render_surfaces fails on N4 [std::exception::what: Failed to
+        compile vertex shader:] (LP: #1284597)
+      . examples: correct "fullscreen-surfaces" option. (LP: #1284554)
+      . Fix mutex data race reported by helgrind in integration test:
+        SwapperSwappingStress (LP: #1282886)
+      . scene: Return null snapshots for sessions without surfaces 
+        (LP: #1281728)
+      . tests: Address some raciness in
+        MesaDisplayTest.drm_device_change_event_triggers_handler. 
+        (LP: #1283085)
+      . tests: Suppress spurious memory errors occuring when running the
+        unit tests on armhf with valgrind. (LP: #1279438)
+      . Mir shows an old frame on client startup (for Mesa GL clients)
+        (LP: #1281938)
+      . tests: Add expectation to validate second SessionAuthorizer method
+        is called wit correct parameter. (LP: #1218436)
+      . Set field "current_format" when sending a display config to the
+        server. (LP: #1277343)
+      . Fix crash in android devices by working around a subtle threading
+        bug, use a dummy thead_local array to push the gl/egl context TLS 
+        into a region where the future wait code does not overwrite it. 
+        (LP: #1280086)
+      . compositor: calling SwitchingBundle::force_requests_to_complete()
+        can be a no-op when there are no requests. (LP: #1281145)
+      . tests: Don't emit an "add" uevent manually when adding a device
+        (LP: #1281146)
+      . config: reduce size of default RPC thread pool. (LP: #1233001)
+      . Clients freeze on startup if 10 or more are already running
+        (LP: #1267323)
+      . Fix Nexus 10 leaking FDs in the hwc prepare/set loop. (LP: #1278658)
+      . Parallelize page flipping with rendering of the next frame, fixing
+        stuttering observed in multi-monitor clone mode (LP: #1213801)
+      . Ubuntu trusty update "glm 0.9.5.1-1" broke Mir builds. Work around the
+        change. (LP: #1285955)
+      . Screencast feature by compositing to offscreen buffer (LP: #1207312)
+
+ -- Kevin Gunn <[e-mail]>  Thu, 27 Feb 2014 19:37:47 -0600
+
 mir (0.1.5+14.04.20140212-0ubuntu1) trusty; urgency=medium
 
   [ Kevin Gunn ]

=== modified file 'debian/control'
--- debian/control	2014-02-06 17:55:08 +0000
+++ debian/control	2014-03-06 14:19:43 +0000
@@ -19,20 +19,20 @@
                libboost-regex-dev,
                libboost-filesystem-dev,
                protobuf-compiler,
-               libdrm-dev [!armhf],
+               libdrm-dev,
                libegl1-mesa-dev,
                libgles2-mesa-dev,
-               libgbm-dev [!armhf],
+               libgbm-dev,
                libglm-dev,
                libprotobuf-dev,
                pkg-config,
-               android-headers (>=4.2.2) [armhf],
-               libhardware-dev [armhf],
+               android-headers (>=4.2.2) [i386 amd64 armhf],
+               libhardware-dev [i386 amd64 armhf],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev,
-               libumockdev-dev [!armhf],
-               umockdev [!armhf],
+               libumockdev-dev,
+               umockdev,
                libudev-dev,
                google-mock (>= 1.6.0+svn437),
                valgrind [!arm64],
@@ -70,7 +70,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver15
+Package: libmirserver16
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -78,6 +78,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libmirplatform (= ${binary:Version}),
+         libmirplatformgraphics-mesa (= ${binary:Version}) |
+           libmirplatformgraphics-android (= ${binary:Version}),
 Description: Display server for Ubuntu - server library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -99,6 +101,36 @@
  Contains the shared libraries required for the Mir server to interact with
  the underlying hardware platform.
 
+Package: libmirplatformgraphics-mesa
+Section: libs
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libmirplatform (= ${binary:Version}),
+Description: Display server for Ubuntu - platform library for Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Mesa drivers.
+
+Package: libmirplatformgraphics-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libmirplatform (= ${binary:Version}),
+Description: Display server for Ubuntu - platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Android drivers.
+
 Package: mircommon-dev
 Section: libdevel
 Architecture: i386 amd64 armhf arm64
@@ -116,7 +148,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver15 (= ${binary:Version}),
+Depends: libmirserver16 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -135,6 +167,8 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libmirclientplatform-mesa (= ${binary:Version}) |
+           libmirclientplatform-android (= ${binary:Version}),
 Description: Display server for Ubuntu - client library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -156,6 +190,36 @@
  .
  Contains header files required to develop against Mir.
 
+Package: libmirclientplatform-mesa
+Section: libs
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: libmirclientplatform
+Description: Display server for Ubuntu - client platform library for Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir clients to interact with
+ the underlying hardware platform using the Mesa drivers.
+
+Package: libmirclientplatform-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: libmirclientplatform
+Description: Display server for Ubuntu - client platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir clients to interact with
+ the underlying hardware platform using the Android drivers.
+
 Package: mir-demos
 Architecture: i386 amd64 armhf arm64
 Depends: ${misc:Depends},

=== added file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	1970-01-01 00:00:00 +0000
+++ debian/create_postinst_prerm_scripts.sh	2014-03-06 14:19:43 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+mir_platform_types="platformgraphics clientplatform"
+mir_platforms="android mesa"
+dpkg_alternatives_priority=500
+deb_host_multiarch=$1
+
+create_script()
+{
+    local script=$1
+    local platform_type=$2
+    local platform=$3
+
+    sed -e "s/@DEB_HOST_MULTIARCH@/$deb_host_multiarch/" \
+        -e "s/@MIR_PLATFORM_TYPE@/$platform_type/" \
+        -e "s/@MIR_PLATFORM@/$platform/" \
+        -e "s/@DPKG_ALTERNATIVES_PRIORITY@/$dpkg_alternatives_priority/" \
+        debian/update-alternatives.${script}.in > debian/libmir$platform_type-$platform.${script}
+}
+
+for platform_type in $mir_platform_types;
+do
+    for platform in $mir_platforms;
+    do
+        create_script postinst $platform_type $platform
+        create_script prerm $platform_type $platform
+    done
+done

=== added file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh	1970-01-01 00:00:00 +0000
+++ debian/install_ld_so_conf.sh	2014-03-06 14:19:43 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+mir_platform_types="platformgraphics clientplatform"
+mir_platforms="android mesa"
+
+DEB_HOST_MULTIARCH=$1
+
+for platform_type in $mir_platform_types;
+do
+    for platform in $mir_platforms;
+    do
+        platform_dir="/usr/lib/$DEB_HOST_MULTIARCH/mir/$platform_type/$platform"
+        package_dir="debian/libmir$platform_type-$platform/$platform_dir"
+        echo "$platform_dir" > $package_dir/ld.so.conf
+    done
+done

=== added file 'debian/libmirclientplatform-android.install'
--- debian/libmirclientplatform-android.install	1970-01-01 00:00:00 +0000
+++ debian/libmirclientplatform-android.install	2014-03-06 14:19:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/mir/clientplatform/android/*

=== added file 'debian/libmirclientplatform-mesa.install'
--- debian/libmirclientplatform-mesa.install	1970-01-01 00:00:00 +0000
+++ debian/libmirclientplatform-mesa.install	2014-03-06 14:19:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/mir/clientplatform/mesa/*

=== modified file 'debian/libmirplatform.install'
--- debian/libmirplatform.install	2013-08-09 03:54:38 +0000
+++ debian/libmirplatform.install	2014-03-06 14:19:43 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/libmirplatform.so
-usr/lib/*/libmirplatformgraphics.so

=== added file 'debian/libmirplatformgraphics-android.install'
--- debian/libmirplatformgraphics-android.install	1970-01-01 00:00:00 +0000
+++ debian/libmirplatformgraphics-android.install	2014-03-06 14:19:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/mir/platformgraphics/android/*

=== added file 'debian/libmirplatformgraphics-mesa.install'
--- debian/libmirplatformgraphics-mesa.install	1970-01-01 00:00:00 +0000
+++ debian/libmirplatformgraphics-mesa.install	2014-03-06 14:19:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/mir/platformgraphics/mesa/*

=== renamed file 'debian/libmirserver15.install' => 'debian/libmirserver16.install'
--- debian/libmirserver15.install	2014-02-06 17:55:08 +0000
+++ debian/libmirserver16.install	2014-03-06 14:19:43 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.15
+usr/lib/*/libmirserver.so.16

=== modified file 'debian/rules'
--- debian/rules	2014-02-04 09:23:51 +0000
+++ debian/rules	2014-03-06 14:19:43 +0000
@@ -21,19 +21,29 @@
 ifeq ($(DEB_HOST_ARCH),armhf)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
-          -DMIR_RUN_ACCEPTANCE_TESTS=OFF -DMIR_RUN_INTEGRATION_TESTS=OFF \
-	  -DMIR_PLATFORM=android 
-else
-ifeq ($(DEB_HOST_ARCH),powerpc)
-	dh_auto_configure -- \
-	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_ENABLE_TESTS=NO
-else
-	dh_auto_configure -- \
-	  $(COMMON_CONFIGURE_OPTIONS)
+	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
+          -DMIR_RUN_INTEGRATION_TESTS=OFF \
+          -DMIR_PLATFORM=android\;mesa
+else
+ifeq ($(DEB_HOST_ARCH),arm64)
+	dh_auto_configure -- \
+	  $(COMMON_CONFIGURE_OPTIONS) \
+	  -DMIR_PLATFORM=mesa
+else
+	dh_auto_configure -- \
+	  $(COMMON_CONFIGURE_OPTIONS) \
+	  -DMIR_PLATFORM=mesa\;android
 endif
 endif
 
 # TODO: we'll use a symbol file once mir is abi stable
 override_dh_makeshlibs:
 	dh_makeshlibs -V
+
+override_dh_install:
+	dh_install --fail-missing
+	sh debian/install_ld_so_conf.sh $(DEB_HOST_MULTIARCH)
+
+override_dh_installdeb:
+	sh debian/create_postinst_prerm_scripts.sh $(DEB_HOST_MULTIARCH)
+	dh_installdeb

=== added file 'debian/update-alternatives.postinst.in'
--- debian/update-alternatives.postinst.in	1970-01-01 00:00:00 +0000
+++ debian/update-alternatives.postinst.in	2014-03-06 14:19:43 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ];
+then
+    update-alternatives --force --install \
+        /etc/ld.so.conf.d/@DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@.conf \
+        @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \
+        /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf \
+        @DPKG_ALTERNATIVES_PRIORITY@
+
+    LDCONFIG_NOTRIGGER=y ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/update-alternatives.prerm.in'
--- debian/update-alternatives.prerm.in	1970-01-01 00:00:00 +0000
+++ debian/update-alternatives.prerm.in	2014-03-06 14:19:43 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ];
+then
+    update-alternatives --remove \
+        @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \
+        /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf
+
+    ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0

=== modified file 'doc/component_reports.md'
--- doc/component_reports.md	2014-01-13 06:12:33 +0000
+++ doc/component_reports.md	2014-03-06 14:19:43 +0000
@@ -18,13 +18,13 @@
 
 Report                  | Handlers
 ----------------------- | --------
-connector-report        | log
-display-report          | log
+connector-report        | log,lttng
+display-report          | log,lttng
 input-report            | log,lttng
 legacy-input-report     | log
 msg-processor-report    | log,lttng
-session-mediator-report | log
-scene-report            | log
+session-mediator-report | log,lttng
+scene-report            | log,lttng
 
 For example, to enable the LTTng input report, one could either use the
 `--input-report=lttng` command-line option to the server, or set the
@@ -40,7 +40,7 @@
 Report              | Handlers
 ------------------- | --------
 rpc-report          | log,lttng
-input-receiver      | log
+input-receiver      | log,lttng
 
 For example, to enable the logging RPC report, one should set the
 `MIR_CLIENT_RPC_REPORT=log` environment variable.

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-01-15 03:41:11 +0000
+++ examples/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -93,12 +93,12 @@
   ${PROJECT_SOURCE_DIR}/include/server
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/include/test/mir_test/draw
   ${GLESv2_INCLUDE_DIRS}
 )
 
-set(RENDER_TO_FB_SOURCES render_to_fb.cpp)
-add_executable(mir_demo_standalone_render_to_fb 
-  ${RENDER_TO_FB_SOURCES}
+add_executable(mir_demo_standalone_render_to_fb
+    render_to_fb.cpp
 )
 
 target_link_libraries(mir_demo_standalone_render_to_fb
@@ -108,6 +108,17 @@
     ${Boost_LIBRARIES}
 )
 
+add_executable(mir_demo_standalone_render_overlays
+    render_overlays.cpp
+)
+
+target_link_libraries(mir_demo_standalone_render_overlays
+    mirserver
+    mirlogging
+    mirdraw
+    mirtestdraw
+)
+
 set(RENDER_SURFACES_SOURCES
     render_surfaces.cpp
     buffer_render_target.cpp

=== modified file 'examples/basic_server_configuration.cpp'
--- examples/basic_server_configuration.cpp	2014-01-29 15:20:07 +0000
+++ examples/basic_server_configuration.cpp	2014-03-06 14:19:43 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "basic_server_configuration.h"
+#include "mir/options/default_configuration.h"
 
 #include "mir/abnormal_exit.h"
 #include "mir/frontend/connector.h"
@@ -34,14 +35,19 @@
 namespace examples
 {
 
-BasicServerConfiguration::BasicServerConfiguration(int argc, char const** argv)
-    : ServerConfiguration(argc, argv)
+BasicServerConfiguration::BasicServerConfiguration(int argc, char const** argv) :
+    ServerConfiguration([argc, argv]
+    {
+        auto result = std::make_shared<options::DefaultConfiguration>(argc, argv);
+
+        namespace po = boost::program_options;
+
+        result->add_options()
+            (launch_child_opt, po::value<std::string>(), "system() command to launch client");
+
+        return result;
+    }())
 {
-    namespace po = boost::program_options;
-
-    add_options()
-        (launch_child_opt, po::value<std::string>(), "system() command to launch client");
-;
 }
 
 void BasicServerConfiguration::launch_client()

=== modified file 'examples/demo-shell/demo_shell.cpp'
--- examples/demo-shell/demo_shell.cpp	2014-01-13 06:12:33 +0000
+++ examples/demo-shell/demo_shell.cpp	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,6 +22,7 @@
 #include "fullscreen_placement_strategy.h"
 #include "../server_configuration.h"
 
+#include "mir/options/default_configuration.h"
 #include "mir/run_mir.h"
 #include "mir/report_exception.h"
 #include "mir/graphics/display.h"
@@ -34,6 +35,7 @@
 namespace mg = mir::graphics;
 namespace mf = mir::frontend;
 namespace mi = mir::input;
+namespace mo = mir::options;
 
 namespace mir
 {
@@ -44,14 +46,19 @@
 {
     DemoServerConfiguration(int argc, char const* argv[],
                             std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
-      : ServerConfiguration(argc, argv),
+      : ServerConfiguration([argc, argv]
+        {
+            auto result = std::make_shared<mo::DefaultConfiguration>(argc, argv);
+
+            namespace po = boost::program_options;
+
+            result->add_options()
+                ("fullscreen-surfaces", "Make all surfaces fullscreen");
+
+            return result;
+        }()),
         filter_list(filter_list)
     {
-        namespace po = boost::program_options;
-
-        add_options()
-            ("fullscreen-surfaces", po::value<bool>(),
-                "Make all surfaces fullscreen [bool:default=false]");
     }
 
     std::shared_ptr<msh::PlacementStrategy> the_shell_placement_strategy() override

=== added file 'examples/render_overlays.cpp'
--- examples/render_overlays.cpp	1970-01-01 00:00:00 +0000
+++ examples/render_overlays.cpp	2014-03-06 14:19:43 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2012, 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#include "mir/default_server_configuration.h"
+#include "mir/graphics/display.h"
+#include "mir/graphics/renderable.h"
+#include "mir/graphics/display_buffer.h"
+#include "mir/graphics/platform.h"
+#include "mir/graphics/graphic_buffer_allocator.h"
+#include "mir/graphics/buffer_properties.h"
+#include "mir/report_exception.h"
+
+#include "graphics_region_factory.h"
+#include "patterns.h"
+
+#include <csignal>
+#include <iostream>
+
+namespace mg=mir::graphics;
+namespace ml=mir::logging;
+namespace mo=mir::options;
+namespace geom=mir::geometry;
+
+namespace
+{
+volatile std::sig_atomic_t running = true;
+
+void signal_handler(int /*signum*/)
+{
+    running = false;
+}
+}
+
+class DemoRenderable : public mg::Renderable
+{
+public:
+    DemoRenderable(std::shared_ptr<mg::Buffer> const& buffer, geom::Rectangle rect)
+        : renderable_buffer(buffer),
+          position(rect)
+    {
+    }
+
+    std::shared_ptr<mg::Buffer> buffer() const
+    {
+        return renderable_buffer;
+    }
+
+    bool alpha_enabled() const
+    {
+        return false;
+    }
+
+    geom::Rectangle screen_position() const
+    {
+        return position;
+    }
+
+private:
+    std::shared_ptr<mg::Buffer> const renderable_buffer;
+    geom::Rectangle const position;
+};
+
+int main(int argc, char const** argv)
+try
+{
+    mir::test::draw::DrawPatternSolid fill_with_green(0x00FF00FF);
+    mir::test::draw::DrawPatternSolid fill_with_blue(0x0000FFFF);
+
+    /* Set up graceful exit on SIGINT and SIGTERM */
+    struct sigaction sa;
+    sa.sa_handler = signal_handler;
+    sa.sa_flags = 0;
+    sigemptyset(&sa.sa_mask);
+
+    sigaction(SIGINT, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
+
+    mir::DefaultServerConfiguration conf{argc, argv};
+
+    auto platform = conf.the_graphics_platform();
+    auto display = platform->create_display(conf.the_display_configuration_policy());
+    auto buffer_allocator = platform->create_buffer_allocator(conf.the_buffer_initializer());
+    auto region_factory = mir::test::draw::create_graphics_region_factory();
+
+     mg::BufferProperties buffer_properties{
+        geom::Size{512, 512},
+        mir_pixel_format_abgr_8888,
+        mg::BufferUsage::hardware
+    };
+
+    auto buffer1 = buffer_allocator->alloc_buffer(buffer_properties);
+    auto buffer2 = buffer_allocator->alloc_buffer(buffer_properties);
+
+    fill_with_green.draw(*region_factory->graphic_region_from_handle(*buffer1->native_buffer_handle()));
+    fill_with_blue.draw(*region_factory->graphic_region_from_handle(*buffer2->native_buffer_handle()));
+
+    geom::Rectangle screen_pos1{{0,0} , {512, 512}};
+    geom::Rectangle screen_pos2{{80,80} , {592,592}};
+    std::list<std::shared_ptr<mg::Renderable>> renderlist
+    {
+        std::make_shared<DemoRenderable>(buffer2, screen_pos2),
+        std::make_shared<DemoRenderable>(buffer1, screen_pos1)
+    };
+
+    while (running)
+    {
+        display->for_each_display_buffer([&](mg::DisplayBuffer& buffer)
+        {
+            buffer.make_current();
+            auto render_fn = [](mg::Renderable const&) {};
+            buffer.render_and_post_update(renderlist, render_fn);
+        });
+    }
+   return 0;
+}
+catch (...)
+{
+    mir::report_exception(std::cerr);
+    return 1;
+}

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2014-02-04 14:48:29 +0000
+++ examples/render_surfaces.cpp	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -18,6 +18,7 @@
 
 #include "mir/compositor/display_buffer_compositor_factory.h"
 #include "mir/compositor/display_buffer_compositor.h"
+#include "mir/options/default_configuration.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/frontend/connector.h"
 #include "mir/shell/surface_creation_parameters.h"
@@ -27,10 +28,12 @@
 #include "mir/graphics/cursor.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
+#include "mir/graphics/gl_context.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/shell/surface.h"
 #include "mir/run_mir.h"
 #include "mir/report_exception.h"
+#include "mir/raii.h"
 
 #include "mir_image.h"
 #include "buffer_render_target.h"
@@ -51,12 +54,14 @@
 namespace mc = mir::compositor;
 namespace ms = mir::scene;
 namespace mf = mir::frontend;
+namespace mo = mir::options;
 namespace msh = mir::shell;
 namespace mi = mir::input;
 namespace geom = mir::geometry;
 namespace mt = mir::tools;
 namespace me = mir::examples;
 
+
 ///\page render_surfaces-example render_surfaces.cpp: A simple program using the mir library.
 ///\tableofcontents
 ///render_surfaces shows the use of mir to render some moving surfaces
@@ -194,7 +199,7 @@
           h{static_cast<float>(s->size().height.as_uint32_t())},
           dx{dx},
           dy{dy},
-          rotation_axis{rotation_axis},
+          rotation_axis(rotation_axis),
           alpha_offset{alpha_offset}
     {
     }
@@ -252,16 +257,22 @@
 class RenderSurfacesServerConfiguration : public me::ServerConfiguration
 {
 public:
-    RenderSurfacesServerConfiguration(int argc, char const** argv)
-        : ServerConfiguration(argc, argv)
+    RenderSurfacesServerConfiguration(int argc, char const** argv) :
+        ServerConfiguration([argc, argv]
+        {
+            auto result = std::make_shared<mo::DefaultConfiguration>(argc, argv);
+
+            namespace po = boost::program_options;
+
+            result->add_options()
+                (surfaces_to_render, po::value<int>()->default_value(5),
+                    "Number of surfaces to render")
+                (display_cursor, po::value<bool>()->default_value(false),
+                    "Display test cursor. (If input is disabled it gets animated.)");
+
+            return result;
+        }())
     {
-        namespace po = boost::program_options;
-
-        add_options()
-            (surfaces_to_render, po::value<int>()->default_value(5),
-                "Number of surfaces to render")
-            (display_cursor, po::value<bool>()->default_value(false),
-                "Display test cursor. (If input is disabled it gets animated.)");
     }
 
     ///\internal [RenderSurfacesServerConfiguration_stubs_tag]
@@ -287,12 +298,17 @@
         class RenderResourcesBufferInitializer : public mg::BufferInitializer
         {
         public:
-            RenderResourcesBufferInitializer()
+            RenderResourcesBufferInitializer(std::unique_ptr<mg::GLContext> gl_context)
+                : gl_context{std::move(gl_context)}
             {
             }
 
             void operator()(mg::Buffer& buffer)
             {
+                auto using_gl_context = mir::raii::paired_calls(
+                    [this] { gl_context->make_current(); },
+                    [this] { gl_context->release_current(); });
+
                 mt::ImageRenderer img_renderer{mir_image.pixel_data,
                                geom::Size{mir_image.width, mir_image.height},
                                mir_image.bytes_per_pixel};
@@ -300,9 +316,13 @@
                 brt.make_current();
                 img_renderer.render();
             }
+
+        private:
+            std::unique_ptr<mg::GLContext> const gl_context;
+
         };
 
-        return std::make_shared<RenderResourcesBufferInitializer>();
+        return std::make_shared<RenderResourcesBufferInitializer>(the_display()->create_gl_context());
     }
     ///\internal [RenderResourcesBufferInitializer_tag]
 
@@ -443,7 +463,7 @@
 
     bool input_is_on()
     {
-        return the_options()->get<bool>(enable_input_opt);
+        return the_options()->get<bool>(mo::enable_input_opt);
     }
 
     std::weak_ptr<mg::Cursor> the_cursor()

=== modified file 'examples/render_to_fb.cpp'
--- examples/render_to_fb.cpp	2014-01-13 06:12:33 +0000
+++ examples/render_to_fb.cpp	2014-03-06 14:19:43 +0000
@@ -27,7 +27,6 @@
 #include <iostream>
 
 namespace mg=mir::graphics;
-namespace ml=mir::logging;
 namespace mo=mir::options;
 
 namespace

=== modified file 'examples/scroll.cpp'
--- examples/scroll.cpp	2014-01-24 11:15:31 +0000
+++ examples/scroll.cpp	2014-03-06 14:19:43 +0000
@@ -95,7 +95,7 @@
 
     EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
     EGLNativeWindowType native_window = (EGLNativeWindowType) mir_surface_get_egl_native_window(surface);
-    assert(native_window != NULL);
+    assert(native_window != (EGLNativeWindowType)NULL);
 
     disp = eglGetDisplay(native_display);
     assert(disp != EGL_NO_DISPLAY);

=== modified file 'examples/server_configuration.cpp'
--- examples/server_configuration.cpp	2014-01-29 15:20:07 +0000
+++ examples/server_configuration.cpp	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -17,6 +17,7 @@
  */
 
 #include "server_configuration.h"
+#include "mir/options/default_configuration.h"
 #include "mir/graphics/display_configuration_policy.h"
 #include "mir/graphics/display_configuration.h"
 #include "mir/input/composite_event_filter.h"
@@ -145,16 +146,21 @@
 
 }
 
-me::ServerConfiguration::ServerConfiguration(int argc, char const** argv)
-    : DefaultServerConfiguration(argc, argv)
+me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
+    DefaultServerConfiguration(configuration_options)
 {
     namespace po = boost::program_options;
 
-    add_options()
+    configuration_options->add_options()
         (display_config_opt, po::value<std::string>()->default_value(clone_opt_val),
             "Display configuration [{clone,sidebyside,single}]");
 }
 
+me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
+    ServerConfiguration(std::make_shared<options::DefaultConfiguration>(argc, argv))
+{
+}
+
 std::shared_ptr<mg::DisplayConfigurationPolicy>
 me::ServerConfiguration::the_display_configuration_policy()
 {

=== modified file 'examples/server_configuration.h'
--- examples/server_configuration.h	2013-08-28 03:41:48 +0000
+++ examples/server_configuration.h	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -23,6 +23,11 @@
 
 namespace mir
 {
+namespace options
+{
+class DefaultConfiguration;
+}
+
 namespace examples
 {
 
@@ -30,6 +35,7 @@
 {
 public:
     ServerConfiguration(int argc, char const** argv);
+    explicit ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options);
 
     std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy() override;
     std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter() override;

=== modified file 'guides/cppguide.xml'
--- guides/cppguide.xml	2014-01-13 04:16:45 +0000
+++ guides/cppguide.xml	2014-03-06 14:19:43 +0000
@@ -1060,12 +1060,13 @@
           be private</a>.
         </p>
         <p>
-          When redefining an inherited virtual function, explicitly
-          declare it <code>virtual</code> in the declaration of the
-          derived class.  Rationale: If <code>virtual</code> is
-          omitted, the reader has to check all ancestors of the
-          class in question to determine if the function is virtual
-          or not.
+          When redefining an inherited virtual method (both pure
+          and non-pure), explicitly declare it <code>override</code>
+          in the declaration of the derived class. Rationale: using
+          <code>override</code> allows the compiler to consistently
+          detect attempts to override methods that have been changed
+          or completely removed. It also makes it straightforward for
+          a reader to determine if a method is virtual or not.
         </p>
       </DECISION>
     </BODY>

=== renamed file 'include/server/mir/abnormal_exit.h' => 'include/platform/mir/abnormal_exit.h'
--- include/server/mir/abnormal_exit.h	2013-04-24 05:22:20 +0000
+++ include/platform/mir/abnormal_exit.h	2014-03-06 14:19:43 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== modified file 'include/platform/mir/graphics/drm_authenticator.h'
--- include/platform/mir/graphics/drm_authenticator.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/drm_authenticator.h	2014-03-06 14:19:43 +0000
@@ -19,8 +19,6 @@
 #ifndef MIR_GRAPHICS_DRM_AUTHENTICATOR_H_
 #define MIR_GRAPHICS_DRM_AUTHENTICATOR_H_
 
-#include <xf86drm.h>
-
 namespace mir
 {
 namespace graphics
@@ -31,7 +29,7 @@
 public:
     virtual ~DRMAuthenticator() {}
 
-    virtual void drm_auth_magic(drm_magic_t magic) = 0;
+    virtual void drm_auth_magic(unsigned int magic) = 0;
 
 protected:
     DRMAuthenticator() = default;

=== added file 'include/platform/mir/options/configuration.h'
--- include/platform/mir/options/configuration.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/options/configuration.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2014 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_OPTIONS_CONFIGURATION_H_
+#define MIR_OPTIONS_CONFIGURATION_H_
+
+#include "mir/options/program_option.h"
+
+#include <memory>
+
+namespace mir
+{
+namespace options
+{
+extern char const* const server_socket_opt;
+extern char const* const no_server_socket_opt;
+extern char const* const enable_input_opt;
+extern char const* const session_mediator_report_opt;
+extern char const* const msg_processor_report_opt;
+extern char const* const compositor_report_opt;
+extern char const* const display_report_opt;
+extern char const* const legacy_input_report_opt;
+extern char const* const connector_report_opt;
+extern char const* const scene_report_opt;
+extern char const* const input_report_opt;
+extern char const* const host_socket_opt;
+extern char const* const standalone_opt;
+extern char const* const frontend_threads_opt;
+
+extern char const* const name_opt;
+extern char const* const offscreen_opt;
+
+extern char const* const glog;
+extern char const* const glog_stderrthreshold;
+extern char const* const glog_minloglevel;
+extern char const* const glog_log_dir;
+
+extern char const* const off_opt_value;
+extern char const* const log_opt_value;
+extern char const* const lttng_opt_value;
+
+extern char const* const platform_graphics_lib;
+
+class Configuration
+{
+public:
+    virtual std::shared_ptr<options::Option> the_options() const = 0;
+
+protected:
+
+    Configuration() = default;
+    virtual ~Configuration() = default;
+    Configuration(Configuration const&) = delete;
+    Configuration& operator=(Configuration const&) = delete;
+};
+}
+}
+
+#endif /* MIR_OPTIONS_CONFIGURATION_H_ */

=== renamed file 'include/server/mir/default_configuration_options.h' => 'include/platform/mir/options/default_configuration.h'
--- include/server/mir/default_configuration_options.h	2014-01-27 17:47:06 +0000
+++ include/platform/mir/options/default_configuration.h	2014-03-06 14:19:43 +0000
@@ -1,100 +1,65 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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_DEFAULT_CONFIGURATION_OPTIONS_H_
-#define MIR_DEFAULT_CONFIGURATION_OPTIONS_H_
-
-#include "mir/options/program_option.h"
-
-#include <memory>
+#ifndef MIR_OPTIONS_DEFAULT_CONFIGURATION_H_
+#define MIR_OPTIONS_DEFAULT_CONFIGURATION_H_
+
+#include "mir/options/configuration.h"
+
 
 namespace mir
 {
-class ConfigurationOptions
-{
-public:
-    static char const* const server_socket_opt;
-    static char const* const no_server_socket_opt;
-    static char const* const enable_input_opt;
-    static char const* const session_mediator_report_opt;
-    static char const* const msg_processor_report_opt;
-    static char const* const compositor_report_opt;
-    static char const* const display_report_opt;
-    static char const* const legacy_input_report_opt;
-    static char const* const connector_report_opt;
-    static char const* const scene_report_opt;
-    static char const* const input_report_opt;
-    static char const* const host_socket_opt;
-    static char const* const standalone_opt;
-    static char const* const frontend_threads_opt;
-    static char const* const name_opt;
-    static char const* const offscreen_opt;
-
-    static char const* const glog;
-    static char const* const glog_stderrthreshold;
-    static char const* const glog_minloglevel;
-    static char const* const glog_log_dir;
-    static char const* const glog_log_dir_default;
-    static int const glog_stderrthreshold_default;
-    static int const glog_minloglevel_default;
-
-    static bool const enable_input_default;
-
-    static char const* const off_opt_value;
-    static char const* const log_opt_value;
-    static char const* const lttng_opt_value;
-
-    static char const* const platform_graphics_lib;
-    static char const* const default_platform_graphics_lib;
-
-    virtual std::shared_ptr<options::Option> the_options() const = 0;
-
-protected:
-
-    int default_ipc_threads = 10;
-
-    ConfigurationOptions() = default;
-    virtual ~ConfigurationOptions() = default;
-    ConfigurationOptions(ConfigurationOptions const&) = delete;
-    ConfigurationOptions& operator=(ConfigurationOptions const&) = delete;
-};
-
-class DefaultConfigurationOptions : public ConfigurationOptions
-{
-public:
-    DefaultConfigurationOptions(int argc, char const* argv[]);
-    virtual ~DefaultConfigurationOptions() = default;
-
-protected:
-    // add_options() allows configuration specializations to add their
-    // own options. This MUST be called before the first invocation of
-    // the_options() - typically during construction.
+namespace options
+{
+class DefaultConfiguration : public Configuration
+{
+public:
+    DefaultConfiguration(int argc, char const* argv[]);
+    virtual ~DefaultConfiguration() = default;
+
+    // add_options() allows users to add their own options. This MUST be called
+    // before the first invocation of the_options() - typically during initialization.
     boost::program_options::options_description_easy_init add_options();
-    virtual void parse_options(boost::program_options::options_description& options_description, options::ProgramOption& options) const;
-    virtual std::shared_ptr<options::Option> the_options() const;
 
 private:
+    // accessed via the base interface, when access to add_options() has been "lost"
+    std::shared_ptr<options::Option> the_options() const override;
+
+    virtual void parse_arguments(
+        boost::program_options::options_description desc,
+        ProgramOption& options,
+        int argc,
+        char const* argv[]) const;
+
+    virtual void parse_environment(
+        boost::program_options::options_description& desc,
+        ProgramOption& options) const;
+
+    virtual void parse_config_file(
+        boost::program_options::options_description& desc,
+        ProgramOption& options) const;
+
     int const argc;
     char const** const argv;
     std::shared_ptr<boost::program_options::options_description> const program_options;
-    std::shared_ptr<options::Option> mutable options;
+    std::shared_ptr<Option> mutable options;
 };
 }
-
-
-#endif /* MIR_DEFAULT_CONFIGURATION_OPTIONS_H_ */
+}
+
+#endif /* MIR_OPTIONS_DEFAULT_CONFIGURATION_H_ */

=== modified file 'include/platform/mir/udev/wrapper.h'
--- include/platform/mir/udev/wrapper.h	2014-01-22 08:32:55 +0000
+++ include/platform/mir/udev/wrapper.h	2014-03-06 14:19:43 +0000
@@ -93,7 +93,7 @@
         bool operator!=(iterator const& rhs) const;
 
         Device const& operator*() const;
-
+        Device const* operator->() const;
     private:
         friend class Enumerator;
 
@@ -135,6 +135,7 @@
     void enable(void);
     int fd(void) const;
 
+    void filter_by_subsystem(std::string const& subsystem);
     void filter_by_subsystem_and_type(std::string const& subsystem, std::string const& devtype);
 
     void process_events(std::function<void(EventType, Device const&)> const& handler) const;

=== modified file 'include/server/mir/compositor/compositor_report.h'
--- include/server/mir/compositor/compositor_report.h	2014-01-10 05:48:41 +0000
+++ include/server/mir/compositor/compositor_report.h	2014-03-06 14:19:43 +0000
@@ -41,17 +41,6 @@
     CompositorReport& operator=(CompositorReport const&) = delete;
 };
 
-class NullCompositorReport : public CompositorReport
-{
-public:
-    void added_display(int width, int height, int x, int y, SubCompositorId id);
-    void began_frame(SubCompositorId id);
-    void finished_frame(bool bypassed, SubCompositorId id);
-    void started();
-    void stopped();
-    void scheduled();
-};
-
 } // namespace compositor
 } // namespace mir
 

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-01-29 18:02:33 +0000
+++ include/server/mir/default_server_configuration.h	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -20,7 +20,6 @@
 
 #include "mir/cached_ptr.h"
 #include "mir/server_configuration.h"
-#include "mir/default_configuration_options.h"
 
 #include <memory>
 #include <string>
@@ -114,10 +113,22 @@
 class Logger;
 }
 
-class DefaultServerConfiguration : public virtual ServerConfiguration, protected DefaultConfigurationOptions
+namespace options
+{
+class Option;
+class Configuration;
+}
+
+namespace report
+{
+class ReportFactory;
+}
+
+class DefaultServerConfiguration : public virtual ServerConfiguration
 {
 public:
     DefaultServerConfiguration(int argc, char const* argv[]);
+    explicit DefaultServerConfiguration(std::shared_ptr<options::Configuration> const& configuration_options);
 
     /** @name DisplayServer dependencies
      * dependencies of DisplayServer on the rest of the Mir
@@ -235,9 +246,7 @@
     virtual std::shared_ptr<time::Clock> the_clock();
 
 protected:
-    using DefaultConfigurationOptions::the_options;
-    using DefaultConfigurationOptions::add_options;
-    using DefaultConfigurationOptions::parse_options;
+    std::shared_ptr<options::Option> the_options() const;
 
     virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();
     virtual std::shared_ptr<scene::MediatingDisplayChanger> the_mediating_display_changer();
@@ -297,6 +306,7 @@
     CachedPtr<scene::MediatingDisplayChanger> mediating_display_changer;
 
 private:
+    std::shared_ptr<options::Configuration> const configuration_options;
     std::shared_ptr<input::EventFilter> const default_filter;
 
     virtual std::string the_socket_file() const;
@@ -313,7 +323,8 @@
     std::shared_ptr<scene::SessionManager>       the_session_manager();
     std::shared_ptr<scene::SurfaceBuilder>       the_surface_builder();
     std::shared_ptr<scene::SurfaceController>    the_surface_controller();
-    std::function<void()> force_threads_to_unblock_callback();
+
+    auto report_factory(char const* report_opt) -> std::unique_ptr<report::ReportFactory>;
 };
 }
 

=== modified file 'include/server/mir/frontend/connector_report.h'
--- include/server/mir/frontend/connector_report.h	2013-09-27 16:07:00 +0000
+++ include/server/mir/frontend/connector_report.h	2014-03-06 14:19:43 +0000
@@ -50,21 +50,6 @@
     ConnectorReport& operator=(const ConnectorReport&) = delete;
 };
 
-class NullConnectorReport : public ConnectorReport
-{
-public:
-    void thread_start() override;
-    void thread_end() override;
-    void starting_threads(int count) override;
-    void stopping_threads(int count) override;
-
-    void creating_session_for(int socket_handle) override;
-    void creating_socket_pair(int server_handle, int client_handle) override;
-
-    void listening_on(std::string const& endpoint) override;
-
-    void error(std::exception const& error) override;
-};
 }
 }
 

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2013-09-24 07:02:12 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2014-03-06 14:19:43 +0000
@@ -54,30 +54,6 @@
         std::string const& what) = 0;
 };
 
-// Do-nothing implementation to satisfy dependencies
-class NullSessionMediatorReport : public SessionMediatorReport
-{
-    virtual void session_connect_called(std::string const& app_name);
-
-    virtual void session_create_surface_called(std::string const& app_name);
-
-    virtual void session_next_buffer_called(std::string const& app_name);
-
-    virtual void session_release_surface_called(std::string const& app_name);
-
-    virtual void session_disconnect_called(std::string const& app_name);
-
-    virtual void session_drm_auth_magic_called(std::string const& app_name);
-
-    virtual void session_configure_surface_called(std::string const& app_name);
-
-    virtual void session_configure_display_called(std::string const& app_name);
-
-    virtual void session_error(
-        std::string const& app_name,
-        char const* method,
-        std::string const& what);
-};
 }
 }
 

=== modified file 'include/server/mir/input/surface.h'
--- include/server/mir/input/surface.h	2014-01-13 06:12:33 +0000
+++ include/server/mir/input/surface.h	2014-03-06 14:19:43 +0000
@@ -31,7 +31,7 @@
 {
 public:
     virtual std::string const& name() const = 0;
-    virtual geometry::Point position() const = 0;
+    virtual geometry::Point top_left() const = 0;
     virtual geometry::Size size() const = 0;
     virtual bool contains(geometry::Point const& point) const = 0;
 

=== added directory 'include/server/mir/logging'
=== renamed file 'include/server/mir/logging/glog_logger.h' => 'include/server/mir/logging/glog_logger.h'
=== removed directory 'include/server/mir/lttng'
=== added directory 'include/server/mir/report'
=== added file 'include/server/mir/report/legacy_input_report.h'
--- include/server/mir/report/legacy_input_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/report/legacy_input_report.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_LEGACY_INPUT_REPORT_H_
+#define MIR_REPORT_LEGACY_INPUT_REPORT_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace logging
+{
+class Logger;
+}
+namespace report
+{
+namespace legacy_input
+{
+void initialize(std::shared_ptr<mir::logging::Logger> const& logger);
+}
+}
+}
+
+#endif // MIR_REPORT_LEGACY_INPUT_REPORT_H_

=== renamed directory 'include/server/mir/logging' => 'include/server/mir/report/logging'
=== modified file 'include/server/mir/scene/scene_report.h'
--- include/server/mir/scene/scene_report.h	2014-01-13 06:12:33 +0000
+++ include/server/mir/scene/scene_report.h	2014-03-06 14:19:43 +0000
@@ -26,16 +26,15 @@
 {
 namespace scene
 {
-class BasicSurface;
-
 class SceneReport
 {
 public:
-    virtual void surface_created(BasicSurface* const surface) = 0;
-    virtual void surface_added(BasicSurface* const surface) = 0;
+    typedef void* BasicSurfaceId;
+    virtual void surface_created(BasicSurfaceId id, std::string const& name) = 0;
+    virtual void surface_added(BasicSurfaceId id, std::string const& name) = 0;
 
-    virtual void surface_removed(BasicSurface* const surface) = 0;
-    virtual void surface_deleted(BasicSurface* const surface) = 0;
+    virtual void surface_removed(BasicSurfaceId id, std::string const& name) = 0;
+    virtual void surface_deleted(BasicSurfaceId id, std::string const& name) = 0;
 
 protected:
     SceneReport() = default;
@@ -44,17 +43,7 @@
     SceneReport& operator=(SceneReport const&) = delete;
 };
 
-class NullSceneReport : public SceneReport
-{
-public:
-    virtual void surface_created(BasicSurface* const /*surface*/) override;
-    virtual void surface_added(BasicSurface* const /*surface*/) override;
-
-    virtual void surface_removed(BasicSurface* const /*surface*/) override;
-    virtual void surface_deleted(BasicSurface* const /*surface*/) override;
-};
-}
-}
-
+}
+}
 
 #endif /* MIR_SCENE_SCENE_REPORT_H_ */

=== added directory 'include/shared/mir/logging'
=== removed directory 'include/shared/mir/logging'
=== renamed file 'include/shared/mir/logging/dumb_console_logger.h' => 'include/shared/mir/logging/dumb_console_logger.h'
=== renamed file 'include/shared/mir/logging/input_timestamp.h' => 'include/shared/mir/logging/input_timestamp.h'
=== renamed file 'include/shared/mir/logging/logger.h' => 'include/shared/mir/logging/logger.h'
=== added directory 'include/shared/mir/report'
=== renamed directory 'include/shared/mir/lttng' => 'include/shared/mir/report/lttng'
=== modified file 'include/shared/mir/report/lttng/mir_tracepoint.h'
--- include/shared/mir/lttng/mir_tracepoint.h	2013-06-03 12:15:44 +0000
+++ include/shared/mir/report/lttng/mir_tracepoint.h	2014-03-06 14:19:43 +0000
@@ -27,7 +27,6 @@
  *
  * See: http://sourceware.org/bugzilla/show_bug.cgi?id=13974
  */
-
 #ifdef __clang__
 namespace mir_systemtap_bug_13974
 {
@@ -36,7 +35,7 @@
 #define mir_tracepoint(c, e, ...) ::mir_systemtap_bug_13974::mir_tracepoint_consume_args(0, __VA_ARGS__)
 #pragma message "Building with clang: Disabling LTTng tracepoints."
 #else
-#define mir_tracepoint(c, e, ...) tracepoint(c, e, __VA_ARGS__)
+#define mir_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)
 #endif
 
 #endif /* MIR_LTTNG_MIR_TRACEPOINT_H_ */

=== modified file 'include/shared/mir/report/lttng/tracepoint_provider.h'
--- include/shared/mir/lttng/tracepoint_provider.h	2013-06-04 10:47:05 +0000
+++ include/shared/mir/report/lttng/tracepoint_provider.h	2014-03-06 14:19:43 +0000
@@ -16,13 +16,15 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#ifndef MIR_LTTNG_TRACEPOINT_PROVIDER_H_
-#define MIR_LTTNG_TRACEPOINT_PROVIDER_H_
+#ifndef MIR_REPORT_LTTNG_TRACEPOINT_PROVIDER_H_
+#define MIR_REPORT_LTTNG_TRACEPOINT_PROVIDER_H_
 
 #include <string>
 
 namespace mir
 {
+namespace report
+{
 namespace lttng
 {
 
@@ -41,5 +43,6 @@
 
 }
 }
+}
 
-#endif /* MIR_LTTNG_TRACEPOINT_PROVIDER_H_ */
+#endif /* MIR_REPORT_LTTNG_TRACEPOINT_PROVIDER_H_ */

=== renamed file 'include/server/mir/shared_library.h' => 'include/shared/mir/shared_library.h'
--- include/server/mir/shared_library.h	2013-06-21 10:07:40 +0000
+++ include/shared/mir/shared_library.h	2014-03-06 14:19:43 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== renamed file 'include/test/mir_test/draw/android_graphics.h' => 'include/test/mir_test/draw/graphics_region_factory.h'
--- include/test/mir_test/draw/android_graphics.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test/draw/graphics_region_factory.h	2014-03-06 14:19:43 +0000
@@ -15,45 +15,36 @@
  *
  * Authored by: Kevin DuBois <[e-mail]>
  */
-#ifndef MIR_TEST_DRAW_ANDROID_GRAPHICS
-#define MIR_TEST_DRAW_ANDROID_GRAPHICS
+#ifndef MIR_TEST_DRAW_GRAPHICS_REGION_FACTORY
+#define MIR_TEST_DRAW_GRAPHICS_REGION_FACTORY
 
+#include "mir/graphics/native_buffer.h"
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/compositor/buffer_stream.h"
-#include "mir/geometry/size.h"
-
-#include <hardware/gralloc.h>
 #include <memory>
 
 namespace mir
 {
-namespace compositor
-{
-    class BufferIPCPackage;
-}
 namespace test
 {
 namespace draw
 {
 
-class TestGrallocMapper
+class GraphicsRegionFactory
 {
 public:
-    TestGrallocMapper();
-    TestGrallocMapper(const hw_module_t *hw_module, alloc_device_t* alloc_dev);
-    ~TestGrallocMapper();
-    std::shared_ptr<MirGraphicsRegion> graphic_region_from_handle(ANativeWindowBuffer* package);
-
-private:
-    TestGrallocMapper(TestGrallocMapper const&) = delete;
-    TestGrallocMapper& operator=(TestGrallocMapper const&) = delete;
-
-    const bool gralloc_ownership;
-    gralloc_module_t* module;
-    alloc_device_t* alloc_dev;
+    virtual ~GraphicsRegionFactory() {}
+    virtual std::shared_ptr<MirGraphicsRegion> graphic_region_from_handle(
+        graphics::NativeBuffer const& native_buffer) = 0;
+
+protected:
+    GraphicsRegionFactory() = default;
+    GraphicsRegionFactory(GraphicsRegionFactory const&) = delete;
+    GraphicsRegionFactory& operator=(GraphicsRegionFactory const&) = delete;
 };
 
-}
-}
-}
-#endif /* MIR_TEST_DRAW_ANDROID_GRAPHICS */
+std::shared_ptr<GraphicsRegionFactory> create_graphics_region_factory();
+
+}
+}
+}
+#endif /* MIR_TEST_DRAW_GRAPHICS_REGION_FACTORY */

=== modified file 'include/test/mir_test/draw/patterns.h'
--- include/test/mir_test/draw/patterns.h	2013-10-14 20:35:46 +0000
+++ include/test/mir_test/draw/patterns.h	2014-03-06 14:19:43 +0000
@@ -72,7 +72,7 @@
 private:
     uint32_t color_pattern [Rows][Cols];
 };
-#include "mir_test/draw/draw_pattern_checkered-inl.h"
+#include "draw_pattern_checkered-inl.h"
 
 }
 }

=== modified file 'include/test/mir_test_doubles/mock_display_device.h'
--- include/test/mir_test_doubles/mock_display_device.h	2014-01-23 17:26:51 +0000
+++ include/test/mir_test_doubles/mock_display_device.h	2014-03-06 14:19:43 +0000
@@ -38,6 +38,7 @@
     MOCK_METHOD1(prepare_gl_and_overlays, void(std::list<std::shared_ptr<graphics::Renderable>> const&));
     MOCK_METHOD2(gpu_render, void(EGLDisplay, EGLSurface));
     MOCK_METHOD1(post, void(graphics::Buffer const&));
+    MOCK_CONST_METHOD1(apply_orientation, bool(MirOrientation));
 };
 }
 }

=== modified file 'include/test/mir_test_doubles/mock_drm.h'
--- include/test/mir_test_doubles/mock_drm.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/mock_drm.h	2014-03-06 14:19:43 +0000
@@ -88,6 +88,7 @@
     MockDRM();
     ~MockDRM() noexcept;
 
+    MOCK_METHOD3(open, int(char const* path, int flags, mode_t mode));
     MOCK_METHOD2(drmOpen, int(const char *name, const char *busid));
     MOCK_METHOD1(drmClose, int(int fd));
     MOCK_METHOD3(drmIoctl, int(int fd, unsigned long request, void *arg));

=== modified file 'include/test/mir_test_doubles/mock_gl.h'
--- include/test/mir_test_doubles/mock_gl.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/mock_gl.h	2014-03-06 14:19:43 +0000
@@ -52,6 +52,7 @@
     MOCK_METHOD1(glCreateShader, GLuint(GLenum));
     MOCK_METHOD2(glDeleteBuffers, void(GLsizei, const GLuint *));
     MOCK_METHOD2(glDeleteFramebuffers, void(GLsizei, const GLuint *));
+    MOCK_METHOD2(glDeleteRenderbuffers, void(GLsizei, const GLuint *));
     MOCK_METHOD1(glDeleteProgram, void(GLuint));
     MOCK_METHOD1(glDeleteShader, void(GLuint));
     MOCK_METHOD2(glDeleteTextures, void(GLsizei, const GLuint *));
@@ -100,6 +101,7 @@
                  void(GLuint, GLint, GLenum, GLboolean, GLsizei,
                       const GLvoid *));
     MOCK_METHOD4(glViewport, void(GLint, GLint, GLsizei, GLsizei));
+    MOCK_METHOD0(glFinish, void());
 };
 
 }

=== modified file 'include/test/mir_test_doubles/mock_hwc_composer_device_1.h'
--- include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2014-01-29 18:54:06 +0000
+++ include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2014-03-06 14:19:43 +0000
@@ -44,6 +44,8 @@
         external_set = false;
         virtual_prepare = false;
         virtual_set = false;
+        fb_fence = -1;
+        retire_fence = -1;
 
         common.version = HWC_DEVICE_API_VERSION_1_1;
 

=== modified file 'include/test/mir_test_doubles/mock_input_surface.h'
--- include/test/mir_test_doubles/mock_input_surface.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/mock_input_surface.h	2014-03-06 14:19:43 +0000
@@ -35,7 +35,7 @@
     MockInputSurface()
     {
         using namespace testing;
-        ON_CALL(*this, position())
+        ON_CALL(*this, top_left())
             .WillByDefault(
                 Return(geometry::Point{}));
         ON_CALL(*this, size())
@@ -46,7 +46,7 @@
             .WillByDefault(testing::ReturnRef(n));
     }
     ~MockInputSurface() noexcept {}
-    MOCK_CONST_METHOD0(position, geometry::Point());
+    MOCK_CONST_METHOD0(top_left, geometry::Point());
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(name, std::string const&());
     MOCK_CONST_METHOD1(contains, bool(geometry::Point const&));

=== renamed file 'include/test/mir_test_doubles/mock_surface_renderer.h' => 'include/test/mir_test_doubles/mock_renderer.h'
--- include/test/mir_test_doubles/mock_surface_renderer.h	2014-01-14 07:02:27 +0000
+++ include/test/mir_test_doubles/mock_renderer.h	2014-03-06 14:19:43 +0000
@@ -15,8 +15,8 @@
  *
  * Authored by: Kevin DuBois <[e-mail]>
  */
-#ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_RENDERER_H_
-#define MIR_TEST_DOUBLES_MOCK_SURFACE_RENDERER_H_
+#ifndef MIR_TEST_DOUBLES_MOCK_RENDERER_H_
+#define MIR_TEST_DOUBLES_MOCK_RENDERER_H_
 
 #include "src/server/compositor/renderer.h"
 
@@ -29,17 +29,19 @@
 namespace doubles
 {
 
-struct MockSurfaceRenderer : public compositor::Renderer
+struct MockRenderer : public compositor::Renderer
 {
-    MOCK_CONST_METHOD1(begin, void(float));
+    MOCK_METHOD1(set_viewport, void(geometry::Rectangle const&));
+    MOCK_METHOD1(set_rotation, void(float));
+    MOCK_CONST_METHOD0(begin, void());
     MOCK_CONST_METHOD2(render, void(compositor::CompositingCriteria const&, graphics::Buffer&));
     MOCK_CONST_METHOD0(end, void());
     MOCK_METHOD0(suspend, void());
 
-    ~MockSurfaceRenderer() noexcept {}
+    ~MockRenderer() noexcept {}
 };
 
 }
 }
 }
-#endif /* MIR_TEST_DOUBLES_MOCK_SURFACE_RENDERER_H_ */
+#endif /* MIR_TEST_DOUBLES_MOCK_RENDERER_H_ */

=== modified file 'include/test/mir_test_doubles/stub_display_builder.h'
--- include/test/mir_test_doubles/stub_display_builder.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/stub_display_builder.h	2014-03-06 14:19:43 +0000
@@ -20,8 +20,7 @@
 #define MIR_TEST_DOUBLES_STUB_DISPLAY_BUILDER_H_
 
 #include "src/platform/graphics/android/display_builder.h"
-#include "stub_display_buffer.h"
-#include "stub_display_device.h"
+#include "src/platform/graphics/android/configurable_display_buffer.h"
 #include <gmock/gmock.h>
 
 namespace mir
@@ -30,25 +29,47 @@
 {
 namespace doubles
 {
+
+struct StubConfigurableDisplayBuffer : public graphics::android::ConfigurableDisplayBuffer
+{
+    StubConfigurableDisplayBuffer(geometry::Rectangle rect)
+     : rect(rect)
+    {
+    }
+
+    geometry::Rectangle view_area() const { return rect; }
+    void make_current() {}
+    void release_current() {}
+    void post_update() {}
+    bool can_bypass() const override { return false; }
+    void render_and_post_update(
+        std::list<std::shared_ptr<graphics::Renderable>> const&,
+        std::function<void(graphics::Renderable const&)> const&) {}
+    MirOrientation orientation() const override { return mir_orientation_normal; }
+    void configure(graphics::DisplayConfigurationOutput const&) {} 
+    graphics::DisplayConfigurationOutput configuration() const
+    {
+        return graphics::DisplayConfigurationOutput{
+                   graphics::DisplayConfigurationOutputId{1},
+                   graphics::DisplayConfigurationCardId{0},
+                   graphics::DisplayConfigurationOutputType::vga,
+                   {}, {}, 0, {}, false, false, {}, 0, mir_pixel_format_abgr_8888, 
+                   mir_power_mode_off,
+                   mir_orientation_normal};
+    }
+private:
+    geometry::Rectangle rect;
+};
+
 struct StubDisplayBuilder : public graphics::android::DisplayBuilder
 {
-    StubDisplayBuilder(std::shared_ptr<graphics::android::DisplayDevice> const& stub_dev, geometry::Size sz)
-        : stub_dev(stub_dev), sz(sz)
+    StubDisplayBuilder(geometry::Size sz)
+        : sz(sz)
     {
     }
 
     StubDisplayBuilder()
-        : StubDisplayBuilder(std::make_shared<StubDisplayDevice>(), geometry::Size{0,0})
-    {
-    }
-
-    StubDisplayBuilder(geometry::Size sz)
-        : StubDisplayBuilder(std::make_shared<StubDisplayDevice>(), sz)
-    {
-    }
-
-    StubDisplayBuilder(std::shared_ptr<graphics::android::DisplayDevice> const& stub_dev)
-        : stub_dev(stub_dev), sz(geometry::Size{0,0})
+        : StubDisplayBuilder(geometry::Size{0,0})
     {
     }
 
@@ -57,20 +78,13 @@
         return mir_pixel_format_abgr_8888;
     }
 
-    std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
-        std::shared_ptr<graphics::android::DisplayDevice> const&,
+    std::unique_ptr<graphics::android::ConfigurableDisplayBuffer> create_display_buffer(
         graphics::android::GLContext const&)
     {
-        return std::unique_ptr<graphics::DisplayBuffer>(
-                new StubDisplayBuffer(geometry::Rectangle{{0,0},sz}));
-    }
-
-    std::shared_ptr<graphics::android::DisplayDevice> create_display_device()
-    {
-        return stub_dev;
-    }
-
-    std::shared_ptr<graphics::android::DisplayDevice> const stub_dev;
+        return std::unique_ptr<graphics::android::ConfigurableDisplayBuffer>(
+                new StubConfigurableDisplayBuffer(geometry::Rectangle{{0,0},sz}));
+    }
+    
     geometry::Size sz;
 };
 }

=== modified file 'include/test/mir_test_doubles/stub_display_configuration.h'
--- include/test/mir_test_doubles/stub_display_configuration.h	2014-01-31 07:35:54 +0000
+++ include/test/mir_test_doubles/stub_display_configuration.h	2014-03-06 14:19:43 +0000
@@ -93,8 +93,8 @@
                 graphics::DisplayConfigurationOutputType::vga,
                 pfs, modes, i,
                 physical_size,
-                ((i % 2) == 0),
-                ((i % 2) == 1),
+                ((i % 2) == 0),  // even numbers have connected==true
+                ((i % 4) == 0),  // only every second even has used==true
                 top_left,
                 mode_index, pfs[0],
                 mir_power_mode_off,

=== added file 'include/test/mir_test_doubles/stub_renderer.h'
--- include/test/mir_test_doubles/stub_renderer.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_doubles/stub_renderer.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_STUB_RENDERER_H_
+#define MIR_TEST_DOUBLES_STUB_RENDERER_H_
+
+#include "src/server/compositor/renderer.h"
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+class StubRenderer : public compositor::Renderer
+{
+public:
+    void set_viewport(geometry::Rectangle const&) override
+    {
+    }
+
+    void set_rotation(float) override
+    {
+    }
+
+    void begin() const override
+    {
+    }
+
+    void render(compositor::CompositingCriteria const&,
+                graphics::Buffer&) const override
+    {
+    }
+
+    void end() const override
+    {
+    }
+
+    void suspend() override
+    {
+    }
+};
+
+
+} // namespace doubles
+} // namespace test
+} // namespace mir
+
+#endif // MIR_TEST_DOUBLES_STUB_RENDERER_H_

=== modified file 'include/test/mir_test_doubles/stub_surface_builder.h'
--- include/test/mir_test_doubles/stub_surface_builder.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/stub_surface_builder.h	2014-03-06 14:19:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -22,8 +22,7 @@
 
 #include "src/server/scene/surface_builder.h"
 #include "src/server/scene/basic_surface.h"
-#include "src/server/scene/surface_data.h"
-#include "mir/scene/scene_report.h"
+#include "src/server/report/null_report_factory.h"
 #include "mir/shell/surface_creation_parameters.h"
 
 #include "mir_test_doubles/stub_buffer_stream.h"
@@ -40,11 +39,13 @@
 public:
     StubSurfaceBuilder() :
         dummy_surface(std::make_shared<scene::BasicSurface>(
-            std::make_shared<scene::SurfaceData>( 
-                std::string("stub"), geometry::Rectangle{{},{}}, [](){}, false),
+            std::string("stub"),
+            geometry::Rectangle{{},{}},
+            [](){},
+            false,
             std::make_shared<StubBufferStream>(),
             std::shared_ptr<input::InputChannel>(),
-            std::make_shared<scene::NullSceneReport>()))
+            mir::report::null_scene_report()))
     {
     }
 

=== modified file 'include/test/mir_test_framework/udev_environment.h'
--- include/test/mir_test_framework/udev_environment.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_framework/udev_environment.h	2014-03-06 14:19:43 +0000
@@ -35,8 +35,6 @@
     UdevEnvironment();
     ~UdevEnvironment() noexcept;
 
-    void add_standard_drm_devices();
-
     std::string add_device(char const* subsystem,
                            char const* name,
                            char const* parent,
@@ -45,6 +43,18 @@
     void remove_device(std::string const& device_path);
     void emit_device_changed(std::string const& device_path);
 
+    /**
+     * Add a device from the set of standard device traces
+     *
+     * Looks for a <tt>name</tt>.umockdev file, and adds a UMockDev device
+     * from that description.
+     *
+     * If <tt>name</tt>.ioctl exists, it loads that ioctl script for the device
+     *
+     * @param name The unadorned filename of the device traces to add.
+     */
+    void add_standard_device(std::string const& name);
+
     UMockdevTestbed *testbed;
 };
 

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-02-06 22:37:53 +0000
+++ src/client/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -18,6 +18,14 @@
 add_subdirectory(rpc/)
 add_subdirectory(lttng/)
 
+if(MIR_BUILD_PLATFORM_ANDROID)
+add_subdirectory(android/)
+endif()
+
+if(MIR_BUILD_PLATFORM_MESA)
+add_subdirectory(mesa/)
+endif()
+
 set(
   CLIENT_SOURCES
 
@@ -38,34 +46,6 @@
   mir_screencast_api.cpp
 )
 
-if( MIR_PLATFORM STREQUAL "android")
-include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
-set(
-  CLIENT_SOURCES
-
-  android/android_client_buffer.cpp
-  android/android_client_buffer_factory.cpp
-  android/android_registrar.cpp
-  android/android_client_platform.cpp
-  android/client_surface_interpreter.cpp
-  android/android_native_display_container.cpp
-  ${CLIENT_SOURCES}
-)
-endif()
-
-if( MIR_PLATFORM STREQUAL "mesa")
-set(
-  CLIENT_SOURCES
-
-  mesa/client_platform.cpp
-  mesa/client_buffer_factory.cpp
-  mesa/client_buffer.cpp
-  mesa/mesa_native_display_container.cpp
-  mesa/native_surface.cpp
-  ${CLIENT_SOURCES}
-)
-endif()
-
 add_library(
   mirclient SHARED
 
@@ -81,14 +61,10 @@
   SOVERSION ${MIRCLIENT_ABI}
 )
 
-# Ensure mirclient_compat_links exist before any dependents of mirclient
-add_dependencies(mirclient mirclient_compat_links)
-
 set(
   MIR_CLIENT_LIBRARIES
   ${Boost_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
-  ${LIBHARDWARE_LIBRARIES}
   ${PROTOBUF_LIBRARIES}
   ${XKBCOMMON_LIBRARIES}
 
@@ -96,10 +72,10 @@
   mirsharedinput
   mirsharedlogging
   mirsharedenv
+  mirsharedsharedlibrary
   mirclientrpc
   mirclientlttngstatic
 
-  ${DRM_LIBRARIES}
   ${MIR_COMMON_PLATFORM_LIBRARIES}
  
   3rd_party

=== added file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/client/android/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -0,0 +1,38 @@
+include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
+add_definitions(-DANDROID)
+
+add_library(
+  mirclientplatformandroid SHARED
+
+  android_client_buffer.cpp
+  android_client_buffer_factory.cpp
+  android_registrar.cpp
+  android_client_platform.cpp
+  client_platform_factory.cpp
+  client_surface_interpreter.cpp
+  android_native_display_container.cpp
+)
+
+set_target_properties(
+  mirclientplatformandroid PROPERTIES
+  OUTPUT_NAME mirclientplatform
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
+)
+
+target_link_libraries(
+  mirclientplatformandroid
+  mirclient
+
+  ${LIBHARDWARE_LIBRARIES}
+)
+
+if (MIR_TEST_PLATFORM STREQUAL "android")
+  add_custom_command(TARGET mirclientplatformandroid
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
+    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
+endif()
+
+install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)

=== modified file 'src/client/android/android_client_platform.cpp'
--- src/client/android/android_client_platform.cpp	2014-01-13 06:12:33 +0000
+++ src/client/android/android_client_platform.cpp	2014-03-06 14:19:43 +0000
@@ -22,7 +22,6 @@
 #include "android_client_buffer_factory.h"
 #include "client_surface_interpreter.h"
 #include "../mir_connection.h"
-#include "../native_client_platform_factory.h"
 
 #include <EGL/egl.h>
 
@@ -44,12 +43,6 @@
 
 }
 
-std::shared_ptr<mcl::ClientPlatform>
-mcl::NativeClientPlatformFactory::create_client_platform(mcl::ClientContext* /*context*/)
-{
-    return std::make_shared<mcla::AndroidClientPlatform>();
-}
-
 std::shared_ptr<mcl::ClientBufferFactory> mcla::AndroidClientPlatform::create_buffer_factory()
 {
     const hw_module_t *hw_module;

=== added file 'src/client/android/client_platform_factory.cpp'
--- src/client/android/client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ src/client/android/client_platform_factory.cpp	2014-03-06 14:19:43 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#include "client_platform_factory.h"
+#include "android_client_platform.h"
+
+namespace mcl = mir::client;
+namespace mcla = mcl::android;
+
+std::shared_ptr<mcl::ClientPlatform>
+mcla::ClientPlatformFactory::create_client_platform(mcl::ClientContext* /*context*/)
+{
+    return std::make_shared<mcla::AndroidClientPlatform>();
+}
+
+extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+{
+    return std::make_shared<mcla::ClientPlatformFactory>();
+}

=== added file 'src/client/android/client_platform_factory.h'
--- src/client/android/client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ src/client/android/client_platform_factory.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_
+
+#include "../client_platform_factory.h"
+
+namespace mir
+{
+namespace client
+{
+namespace android
+{
+
+class ClientPlatformFactory : public client::ClientPlatformFactory
+{
+public:
+    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_ */

=== modified file 'src/client/client_platform_factory.h'
--- src/client/client_platform_factory.h	2013-04-24 05:22:20 +0000
+++ src/client/client_platform_factory.h	2014-03-06 14:19:43 +0000
@@ -18,6 +18,8 @@
 #ifndef MIR_CLIENT_CLIENT_PLATFORM_FACTORY_H_
 #define MIR_CLIENT_CLIENT_PLATFORM_FACTORY_H_
 
+#include <memory>
+
 namespace mir
 {
 namespace client
@@ -29,16 +31,19 @@
 class ClientPlatformFactory
 {
 public:
-    virtual ~ClientPlatformFactory() {}
+    virtual ~ClientPlatformFactory() = default;
 
     virtual std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) = 0;
 
 protected:
     ClientPlatformFactory() = default;
-    ClientPlatformFactory(const ClientPlatformFactory& p) = delete;
-    ClientPlatformFactory& operator=(const ClientPlatformFactory& p) = delete;
+    ClientPlatformFactory(ClientPlatformFactory const& p) = delete;
+    ClientPlatformFactory& operator=(ClientPlatformFactory const& p) = delete;
 };
 
+extern "C" typedef std::shared_ptr<ClientPlatformFactory>(*CreateClientPlatformFactory)();
+extern "C" std::shared_ptr<ClientPlatformFactory> create_client_platform_factory();
+
 }
 }
 

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-01-14 04:10:15 +0000
+++ src/client/default_connection_configuration.cpp	2014-03-06 14:19:43 +0000
@@ -22,14 +22,16 @@
 #include "rpc/make_rpc_channel.h"
 #include "rpc/null_rpc_report.h"
 #include "mir/logging/dumb_console_logger.h"
-#include "native_client_platform_factory.h"
 #include "mir/input/input_platform.h"
 #include "mir/input/null_input_receiver_report.h"
 #include "logging/rpc_report.h"
 #include "logging/input_receiver_report.h"
 #include "lttng/rpc_report.h"
+#include "lttng/input_receiver_report.h"
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
+#include "mir/shared_library.h"
+#include "client_platform_factory.h"
 
 namespace mcl = mir::client;
 
@@ -38,6 +40,23 @@
 std::string const off_opt_val{"off"};
 std::string const log_opt_val{"log"};
 std::string const lttng_opt_val{"lttng"};
+std::string const default_platform_lib{"libmirclientplatform.so"};
+
+mir::SharedLibrary const* load_library(std::string const& libname)
+{
+    // There's no point in loading twice, and it isn't safe to unload...
+    static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
+
+    if (auto& ptr = libraries_cache[libname])
+    {
+        return ptr.get();
+    }
+    else
+    {
+        ptr = std::make_shared<mir::SharedLibrary>(libname);
+        return ptr.get();
+    }
+}
 }
 
 mcl::DefaultConnectionConfiguration::DefaultConnectionConfiguration(
@@ -82,7 +101,15 @@
     return client_platform_factory(
         []
         {
-            return std::make_shared<mcl::NativeClientPlatformFactory>();
+            auto const val_raw = getenv("MIR_CLIENT_PLATFORM_LIB");
+            std::string const val{val_raw ? val_raw : default_platform_lib};
+            auto const platform_lib = load_library(val);
+
+            auto const create_client_platform_factory =
+                platform_lib->load_function<mcl::CreateClientPlatformFactory>(
+                    "create_client_platform_factory");
+
+            return create_client_platform_factory();
         });
 }
 
@@ -131,6 +158,8 @@
 
             if (val == log_opt_val)
                 return std::make_shared<mcl::logging::InputReceiverReport>(the_logger());
+            else if (val == lttng_opt_val)
+                return std::make_shared<mcl::lttng::InputReceiverReport>();
             else
                 return std::make_shared<mir::input::receiver::NullInputReceiverReport>();
         });

=== modified file 'src/client/lttng/CMakeLists.txt'
--- src/client/lttng/CMakeLists.txt	2014-01-13 06:12:33 +0000
+++ src/client/lttng/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -5,13 +5,10 @@
 
   client_tracepoint_provider.cpp
   rpc_report.cpp
-)
-
-add_library(
-  mirclientlttng SHARED
-
-  rpc_report_tp.c
-)
+  input_receiver_report.cpp
+)
+
+add_library(mirclientlttng SHARED tracepoints.c)
 
 # Don't treat missing-field-initializers as an error, since
 # the LTTng macros contain code that triggers this (but it's

=== modified file 'src/client/lttng/client_tracepoint_provider.h'
--- src/client/lttng/client_tracepoint_provider.h	2013-06-03 12:15:45 +0000
+++ src/client/lttng/client_tracepoint_provider.h	2014-03-06 14:19:43 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_CLIENT_LTTNG_CLIENT_TRACEPOINT_PROVIDER_H_
 #define MIR_CLIENT_LTTNG_CLIENT_TRACEPOINT_PROVIDER_H_
 
-#include "mir/lttng/tracepoint_provider.h"
+#include "mir/report/lttng/tracepoint_provider.h"
 
 namespace mir
 {
@@ -28,7 +28,7 @@
 namespace lttng
 {
 
-class ClientTracepointProvider : public mir::lttng::TracepointProvider
+class ClientTracepointProvider : public mir::report::lttng::TracepointProvider
 {
 public:
     ClientTracepointProvider();

=== added file 'src/client/lttng/input_receiver_report.cpp'
--- src/client/lttng/input_receiver_report.cpp	1970-01-01 00:00:00 +0000
+++ src/client/lttng/input_receiver_report.cpp	2014-03-06 14:19:43 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "input_receiver_report.h"
+#include "mir/report/lttng/mir_tracepoint.h"
+
+#include <stdexcept>
+#include <boost/throw_exception.hpp>
+
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "input_receiver_report_tp.h"
+
+void mir::client::lttng::InputReceiverReport::received_event(MirEvent const& event)
+{
+    switch (event.type)
+    {
+    case mir_event_type_key:
+        report(event.key);
+        break;
+    case mir_event_type_motion:
+        report(event.motion);
+        break;
+    default:
+        BOOST_THROW_EXCEPTION(std::runtime_error("Unexpected event type"));
+    }
+}
+
+void mir::client::lttng::InputReceiverReport::report(MirKeyEvent const& event) const
+{
+    mir_tracepoint(mir_client_input_receiver, key_event, event.device_id, event.source_id,
+                   static_cast<int>(event.action), static_cast<int>(event.flags), event.modifiers, event.key_code,
+                   event.scan_code, event.down_time, event.event_time);
+}
+
+void mir::client::lttng::InputReceiverReport::report(MirMotionEvent const& event) const
+{
+    mir_tracepoint(mir_client_input_receiver, motion_event, event.device_id, event.source_id, event.action,
+                   static_cast<int>(event.flags), event.modifiers, event.edge_flags,
+                   static_cast<int>(event.button_state), event.down_time, event.event_time);
+    for (unsigned int i = 0; i < event.pointer_count; i++)
+    {
+        mir_tracepoint(mir_client_input_receiver, motion_event_coordinate,
+                       event.pointer_coordinates[i].id, event.pointer_coordinates[i].x, event.pointer_coordinates[i].y,
+                       event.pointer_coordinates[i].touch_major, event.pointer_coordinates[i].touch_minor,
+                       event.pointer_coordinates[i].size, event.pointer_coordinates[i].pressure,
+                       event.pointer_coordinates[i].orientation);
+    }
+}
+

=== added file 'src/client/lttng/input_receiver_report.h'
--- src/client/lttng/input_receiver_report.h	1970-01-01 00:00:00 +0000
+++ src/client/lttng/input_receiver_report.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_H_
+#define MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_H_
+
+#include "mir/input/input_receiver_report.h"
+#include "client_tracepoint_provider.h"
+
+namespace mir
+{
+namespace client
+{
+namespace lttng
+{
+
+class InputReceiverReport : public input::receiver::InputReceiverReport
+{
+public:
+    void received_event(MirEvent const& event) override;
+private:
+    void report(MirKeyEvent const& event) const;
+    void report(MirMotionEvent const& event) const;
+    ClientTracepointProvider tp_provider;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_H_ */

=== added file 'src/client/lttng/input_receiver_report_tp.h'
--- src/client/lttng/input_receiver_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/client/lttng/input_receiver_report_tp.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_client_input_receiver
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./input_receiver_report_tp.h"
+
+#if !defined(MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_
+
+#include <lttng/tracepoint.h>
+
+#ifdef __clang__
+/*
+ * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
+ * these functions are unused and so generate fatal warnings.
+ * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
+ */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wunused-function"
+#endif
+
+TRACEPOINT_EVENT(
+    mir_client_input_receiver,
+    key_event,
+    TP_ARGS(int32_t, device_id, int32_t, source_id, int, action, int, flags, unsigned int, modifiers, int32_t, key_code, int32_t, scan_code, int64_t, down_time, int64_t, event_time),
+    TP_FIELDS(
+        ctf_integer(int32_t, device_id, device_id)
+        ctf_integer(int32_t, source_id, source_id)
+        ctf_integer(int, action, action)
+        ctf_integer(int, flags, flags)
+        ctf_integer(unsigned int, modifiers, modifiers)
+        ctf_integer(int32_t, key_code, key_code)
+        ctf_integer(int32_t, scan_code, scan_code)
+        ctf_integer(int64_t, down_time, down_time)
+        ctf_integer(int64_t, event_time, event_time)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_input_receiver,
+    motion_event,
+    TP_ARGS(int32_t, device_id, int32_t, source_id, int, action, int, flags, unsigned int, modifiers, int32_t, edge_flags, int, button_state, int64_t, down_time, int64_t, event_time),
+    TP_FIELDS(
+        ctf_integer(int32_t, device_id, device_id)
+        ctf_integer(int32_t, source_id, source_id)
+        ctf_integer(int, action, action)
+        ctf_integer(int, flags, flags)
+        ctf_integer(unsigned int, modifiers, modifiers)
+        ctf_integer(int32_t, edge_flags, edge_flags)
+        ctf_integer(int, button_state, button_state)
+        ctf_integer(int64_t, down_time, down_time)
+        ctf_integer(int64_t, event_time, event_time)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_input_receiver,
+    motion_event_coordinate,
+    TP_ARGS(int, id, float, x, float, y, float, touch_major, float, touch_minor, float, size, float, pressure, float, orientation),
+    TP_FIELDS(
+        ctf_integer(int, id, id)
+        ctf_float(float, x, x)
+        ctf_float(float, y, y)
+        ctf_float(float, touch_major, touch_major)
+        ctf_float(float, touch_minor, touch_minor)
+        ctf_float(float, size, size)
+        ctf_float(float, pressure, pressure)
+        ctf_float(float, orientation, orientation)
+    )
+)
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif /* MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>

=== modified file 'src/client/lttng/rpc_report.cpp'
--- src/client/lttng/rpc_report.cpp	2013-09-26 13:50:11 +0000
+++ src/client/lttng/rpc_report.cpp	2014-03-06 14:19:43 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "rpc_report.h"
-#include "mir/lttng/mir_tracepoint.h"
+#include "mir/report/lttng/mir_tracepoint.h"
 
 #include "mir_protobuf_wire.pb.h"
 

=== removed file 'src/client/lttng/rpc_report_tp.c'
--- src/client/lttng/rpc_report_tp.c	2013-06-03 12:15:45 +0000
+++ src/client/lttng/rpc_report_tp.c	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/* The probes need to be compiled in a C file (not C++) */
-#define TRACEPOINT_CREATE_PROBES
-
-#include "rpc_report_tp.h"

=== added file 'src/client/lttng/tracepoints.c'
--- src/client/lttng/tracepoints.c	1970-01-01 00:00:00 +0000
+++ src/client/lttng/tracepoints.c	2014-03-06 14:19:43 +0000
@@ -0,0 +1,5 @@
+/* The probes need to be compiled in a C file (not C++) */
+#define TRACEPOINT_CREATE_PROBES
+
+#include "rpc_report_tp.h"
+#include "input_receiver_report_tp.h"

=== added file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/client/mesa/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -0,0 +1,40 @@
+include_directories(
+    ${DRM_INCLUDE_DIRS}
+    ${EGL_INCLUDE_DIRS}
+)
+
+add_library(
+  mirclientplatformmesa SHARED
+
+  client_platform_factory.cpp
+  client_platform.cpp
+  client_buffer_factory.cpp
+  client_buffer.cpp
+  mesa_native_display_container.cpp
+  native_surface.cpp
+)
+
+set_target_properties(
+  mirclientplatformmesa PROPERTIES
+  OUTPUT_NAME mirclientplatform
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
+)
+
+target_link_libraries(
+  mirclientplatformmesa
+  mirclient
+
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+)
+
+if (MIR_TEST_PLATFORM STREQUAL "mesa")
+  add_custom_command(TARGET mirclientplatformmesa
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
+    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
+endif()
+
+install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
+

=== modified file 'src/client/mesa/client_platform.cpp'
--- src/client/mesa/client_platform.cpp	2014-01-13 06:12:33 +0000
+++ src/client/mesa/client_platform.cpp	2014-03-06 14:19:43 +0000
@@ -20,14 +20,9 @@
 #include "client_platform.h"
 #include "client_buffer_factory.h"
 #include "mesa_native_display_container.h"
-#include "buffer_file_ops.h"
 #include "native_surface.h"
 #include "../mir_connection.h"
 #include "../client_buffer_factory.h"
-#include "../native_client_platform_factory.h"
-
-#include <sys/mman.h>
-#include <unistd.h>
 
 namespace mcl=mir::client;
 namespace mclm=mir::client::mesa;
@@ -36,31 +31,6 @@
 namespace
 {
 
-struct RealBufferFileOps : public mclm::BufferFileOps
-{
-    int close(int fd) const
-    {
-        while (::close(fd) == -1)
-        {
-            // Retry on EINTR, return error on anything else
-            if (errno != EINTR)
-                return errno;
-        }
-        return 0;
-    }
-
-    void* map(int fd, off_t offset, size_t size) const
-    {
-        return mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-                    fd, offset);
-    }
-
-    void unmap(void* addr, size_t size) const
-    {
-        munmap(addr, size);
-    }
-};
-
 struct NativeDisplayDeleter
 {
     NativeDisplayDeleter(mcl::EGLNativeDisplayContainer& container)
@@ -79,14 +49,6 @@
 
 }
 
-std::shared_ptr<mcl::ClientPlatform>
-mcl::NativeClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
-{
-    auto buffer_file_ops = std::make_shared<RealBufferFileOps>();
-    return std::make_shared<mclm::ClientPlatform>(
-        context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
-}
-
 mclm::ClientPlatform::ClientPlatform(
         ClientContext* const context,
         std::shared_ptr<BufferFileOps> const& buffer_file_ops,
@@ -125,7 +87,7 @@
     //TODO: this is awkward on both android and gbm...
     auto native_window = new NativeSurface(*client_surface);
     auto egl_native_window = new EGLNativeWindowType;
-    *egl_native_window = native_window;
+    *egl_native_window = reinterpret_cast<EGLNativeWindowType>(native_window);
     NativeWindowDeleter deleter(native_window);
     return std::shared_ptr<EGLNativeWindowType>(egl_native_window, deleter);
 }

=== added file 'src/client/mesa/client_platform_factory.cpp'
--- src/client/mesa/client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ src/client/mesa/client_platform_factory.cpp	2014-03-06 14:19:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#include "client_platform_factory.h"
+#include "client_platform.h"
+#include "buffer_file_ops.h"
+#include "../egl_native_display_container.h"
+
+#include <sys/mman.h>
+#include <unistd.h>
+
+namespace mcl = mir::client;
+namespace mclm = mcl::mesa;
+
+namespace
+{
+
+struct RealBufferFileOps : public mclm::BufferFileOps
+{
+    int close(int fd) const
+    {
+        while (::close(fd) == -1)
+        {
+            // Retry on EINTR, return error on anything else
+            if (errno != EINTR)
+                return errno;
+        }
+        return 0;
+    }
+
+    void* map(int fd, off_t offset, size_t size) const
+    {
+        return mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                    fd, offset);
+    }
+
+    void unmap(void* addr, size_t size) const
+    {
+        munmap(addr, size);
+    }
+};
+
+}
+
+std::shared_ptr<mcl::ClientPlatform>
+mclm::ClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
+{
+    auto buffer_file_ops = std::make_shared<RealBufferFileOps>();
+    return std::make_shared<mclm::ClientPlatform>(
+        context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
+}
+
+extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+{
+    return std::make_shared<mclm::ClientPlatformFactory>();
+}

=== added file 'src/client/mesa/client_platform_factory.h'
--- src/client/mesa/client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ src/client/mesa/client_platform_factory.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_
+
+#include "../client_platform_factory.h"
+
+namespace mir
+{
+namespace client
+{
+namespace mesa
+{
+
+class ClientPlatformFactory : public client::ClientPlatformFactory
+{
+public:
+    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_ */

=== modified file 'src/client/mesa/native_surface.cpp'
--- src/client/mesa/native_surface.cpp	2014-01-27 16:59:40 +0000
+++ src/client/mesa/native_surface.cpp	2014-03-06 14:19:43 +0000
@@ -46,7 +46,7 @@
 }
 
 mclm::NativeSurface::NativeSurface(ClientSurface& surface)
-    : surface(surface)
+    : starting(true), surface(surface)
 {
     surface_advance_buffer = advance_buffer_static;
     surface_get_parameters = get_parameters_static;
@@ -55,7 +55,17 @@
 
 int mclm::NativeSurface::advance_buffer(MirBufferPackage* buffer_package)
 {
-    surface.request_and_wait_for_next_buffer();
+    /*
+     * At present dri2_create_mir_window_surface will trigger
+     * mir_advance_colour_buffer which will land here. Since we're still
+     * creating the window, we don't have any buffers we want the server to
+     * composite, so avoid sending a request to the server on startup:
+     */
+    if (starting)
+        starting = false;
+    else
+        surface.request_and_wait_for_next_buffer();
+
     auto buffer = surface.get_current_buffer();
 
     auto buffer_to_driver = buffer->native_buffer_handle();

=== modified file 'src/client/mesa/native_surface.h'
--- src/client/mesa/native_surface.h	2014-01-13 06:12:33 +0000
+++ src/client/mesa/native_surface.h	2014-03-06 14:19:43 +0000
@@ -39,6 +39,7 @@
     int set_swapinterval(int interval);
 
 private:
+    bool starting;
     ClientSurface& surface;
 };
 

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2014-01-28 18:21:14 +0000
+++ src/client/mir_client_library.cpp	2014-03-06 14:19:43 +0000
@@ -25,7 +25,6 @@
 #include "mir_connection.h"
 #include "display_configuration.h"
 #include "mir_surface.h"
-#include "native_client_platform_factory.h"
 #include "egl_native_display_container.h"
 #include "default_connection_configuration.h"
 #include "lifecycle_control.h"
@@ -397,7 +396,7 @@
 
 MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface)
 {
-    return surface->generate_native_window();
+    return reinterpret_cast<MirEGLNativeWindowType>(surface->generate_native_window());
 }
 
 MirWaitHandle* mir_surface_set_type(MirSurface *surf,

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2014-01-24 18:11:19 +0000
+++ src/client/mir_connection.cpp	2014-03-06 14:19:43 +0000
@@ -16,8 +16,6 @@
  * Authored by: Thomas Guest <[e-mail]>
  */
 
-#include "mir/logging/logger.h"
-
 #include "mir_connection.h"
 #include "mir_surface.h"
 #include "client_platform.h"
@@ -28,6 +26,8 @@
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
 
+#include "mir/logging/logger.h"
+
 #include <algorithm>
 #include <cstddef>
 #include <unistd.h>
@@ -458,6 +458,7 @@
             display_request->set_output_id(output.output_id);
             display_request->set_used(output.used);
             display_request->set_current_mode(output.current_mode);
+            display_request->set_current_format(output.current_format);
             display_request->set_position_x(output.position_x);
             display_request->set_position_y(output.position_y);
             display_request->set_power_mode(output.power_mode);

=== modified file 'src/client/mir_screencast_api.cpp'
--- src/client/mir_screencast_api.cpp	2014-01-29 18:02:33 +0000
+++ src/client/mir_screencast_api.cpp	2014-03-06 14:19:43 +0000
@@ -96,5 +96,5 @@
 
 MirEGLNativeWindowType mir_screencast_egl_native_window(MirScreencast* screencast)
 {
-    return screencast->egl_native_window();
+    return reinterpret_cast<MirEGLNativeWindowType>(screencast->egl_native_window());
 }

=== removed file 'src/client/native_client_platform_factory.h'
--- src/client/native_client_platform_factory.h	2013-06-17 09:51:42 +0000
+++ src/client/native_client_platform_factory.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_CLIENT_NATIVE_CLIENT_PLATFORM_FACTORY_
-#define MIR_CLIENT_NATIVE_CLIENT_PLATFORM_FACTORY_
-
-#include "client_platform_factory.h"
-
-namespace mir
-{
-namespace client
-{
-
-/**
- * Factory for creating the native client platform.
- * \ingroup platform_enablement
- */
-class NativeClientPlatformFactory : public ClientPlatformFactory
-{
-public:
-    /**
-     * Creates a client platform.
-     *
-     * This method needs to be implemented by each platform.
-     *
-     * \param [in] context information about the client
-     */
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context);
-};
-
-}
-}
-
-#endif /* MIR_CLIENT_NATIVE_CLIENT_PLATFORM_FACTORY_ */

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ src/platform/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -17,3 +17,4 @@
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 add_subdirectory(graphics/)
+add_subdirectory(options)

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ src/platform/graphics/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -8,7 +8,6 @@
   egl_extensions.cpp
   egl_resources.cpp
   display_configuration.cpp
-  null_display_report.cpp
   buffer_basic.cpp
   pixel_format_utils.cpp
 )
@@ -26,11 +25,11 @@
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
 )
 
-if (MIR_PLATFORM STREQUAL "android")
+if (MIR_BUILD_PLATFORM_ANDROID)
   add_subdirectory(android/)
 endif()
 
-if (MIR_PLATFORM STREQUAL "mesa")
+if (MIR_BUILD_PLATFORM_MESA)
   add_subdirectory(mesa/)
 endif()
 

=== modified file 'src/platform/graphics/android/CMakeLists.txt'
--- src/platform/graphics/android/CMakeLists.txt	2014-01-21 18:09:35 +0000
+++ src/platform/graphics/android/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -4,8 +4,11 @@
     ${GLESv2_INCLUDE_DIRS}
 )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+add_definitions( -DANDROID )
+
 add_library(
-  mirplatformgraphics SHARED
+  mirplatformgraphicsandroid SHARED
 
   android_platform.cpp
   android_buffer_allocator.cpp
@@ -31,8 +34,14 @@
   gl_context.cpp
 )
 
+set_target_properties(
+  mirplatformgraphicsandroid PROPERTIES
+  OUTPUT_NAME mirplatformgraphics
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
+)
+
 target_link_libraries(
-  mirplatformgraphics
+  mirplatformgraphicsandroid
 
   mirplatform
   mirsharedandroid
@@ -42,4 +51,13 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
-install(TARGETS mirplatformgraphics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if (MIR_TEST_PLATFORM STREQUAL "android")
+  add_custom_command(TARGET mirplatformgraphicsandroid
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so
+    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
+endif()
+
+install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)

=== modified file 'src/platform/graphics/android/android_display.cpp'
--- src/platform/graphics/android/android_display.cpp	2014-01-31 07:48:24 +0000
+++ src/platform/graphics/android/android_display.cpp	2014-03-06 14:19:43 +0000
@@ -17,14 +17,13 @@
  */
 
 #include "mir/graphics/platform.h"
-#include "mir/graphics/display_configuration.h"
+#include "android_display_configuration.h"
 #include "mir/graphics/display_report.h"
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/gl_context.h"
 #include "mir/graphics/egl_resources.h"
 #include "android_display.h"
 #include "display_builder.h"
-#include "display_device.h"
 #include "mir/geometry/rectangle.h"
 
 namespace mga=mir::graphics::android;
@@ -35,9 +34,7 @@
                                     std::shared_ptr<DisplayReport> const& display_report)
     : display_builder{display_builder},
       gl_context{display_builder->display_format(), *display_report},
-      display_device(display_builder->create_display_device()),
-      display_buffer{display_builder->create_display_buffer(display_device, gl_context)},
-      current_configuration{display_buffer->view_area().size}
+      display_buffer{display_builder->create_display_buffer(gl_context)}
 {
     display_report->report_successful_setup_of_native_resources();
 
@@ -55,31 +52,15 @@
 std::unique_ptr<mg::DisplayConfiguration> mga::AndroidDisplay::configuration() const
 {
     return std::unique_ptr<mg::DisplayConfiguration>(
-        new mga::AndroidDisplayConfiguration(current_configuration)
-    );
+        new mga::AndroidDisplayConfiguration(display_buffer->configuration()));
 }
 
 void mga::AndroidDisplay::configure(mg::DisplayConfiguration const& configuration)
 {
-    MirOrientation orientation = mir_orientation_normal;
-
     configuration.for_each_output([&](mg::DisplayConfigurationOutput const& output)
     {
-        // TODO: Properly support multiple outputs
-        display_device->mode(output.power_mode);
-        orientation = output.orientation;
+        display_buffer->configure(output);
     });
-    current_configuration = dynamic_cast<mga::AndroidDisplayConfiguration const&>(configuration);
-
-    /*
-     * It's tempting to put orient() into the base class and so avoid this
-     * cast, but we only need it in the Android implementation right now.
-     */
-    if (android::DisplayBuffer* db =
-            dynamic_cast<mga::DisplayBuffer*>(display_buffer.get()))
-    {
-        db->orient(orientation);
-    }
 }
 
 void mga::AndroidDisplay::register_configuration_change_handler(

=== modified file 'src/platform/graphics/android/android_display.h'
--- src/platform/graphics/android/android_display.h	2014-01-31 07:48:24 +0000
+++ src/platform/graphics/android/android_display.h	2014-03-06 14:19:43 +0000
@@ -19,9 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_ANDROID_DISPLAY_H_
 #define MIR_GRAPHICS_ANDROID_ANDROID_DISPLAY_H_
 
-#include "display_buffer.h"
 #include "mir/graphics/display.h"
-#include "android_display_configuration.h"
 #include "gl_context.h"
 
 #include <memory>
@@ -35,10 +33,9 @@
 
 namespace android
 {
-class DisplayDevice;
-
 class DisplayBuilder;
 class DisplaySupportProvider;
+class ConfigurableDisplayBuffer;
 
 class AndroidDisplay : public Display
 {
@@ -69,10 +66,9 @@
 private:
     std::shared_ptr<DisplayBuilder> const display_builder;
     GLContext gl_context;
-    std::shared_ptr<DisplayDevice> const display_device;
+
     //we only have a primary display at the moment
-    std::unique_ptr<graphics::DisplayBuffer> const display_buffer;
-    AndroidDisplayConfiguration current_configuration;
+    std::unique_ptr<ConfigurableDisplayBuffer> const display_buffer;
 };
 
 }

=== modified file 'src/platform/graphics/android/android_display_configuration.cpp'
--- src/platform/graphics/android/android_display_configuration.cpp	2014-01-23 22:03:09 +0000
+++ src/platform/graphics/android/android_display_configuration.cpp	2014-03-06 14:19:43 +0000
@@ -20,25 +20,9 @@
 namespace mga = mg::android;
 namespace geom = mir::geometry;
 
-mga::AndroidDisplayConfiguration::AndroidDisplayConfiguration(geom::Size const& display_size)
-        : configuration{mg::DisplayConfigurationOutputId{1},
-                        mg::DisplayConfigurationCardId{0},
-                        mg::DisplayConfigurationOutputType::lvds,
-                        {
-                            mir_pixel_format_abgr_8888,
-                            mir_pixel_format_xbgr_8888
-                        },
-                        {mg::DisplayConfigurationMode{display_size,0.0f}},
-                        0,
-                        geom::Size{0,0},
-                        true,
-                        true,
-                        geom::Point{0,0},
-                        0,
-                        mir_pixel_format_abgr_8888,
-                        mir_power_mode_on,
-                        mir_orientation_normal},
-          card{mg::DisplayConfigurationCardId{0}, 1}
+mga::AndroidDisplayConfiguration::AndroidDisplayConfiguration(mg::DisplayConfigurationOutput && output)
+    : configuration(std::move(output)),
+      card{mg::DisplayConfigurationCardId{0}, 1}
 {
 }
 

=== modified file 'src/platform/graphics/android/android_display_configuration.h'
--- src/platform/graphics/android/android_display_configuration.h	2014-01-13 06:12:33 +0000
+++ src/platform/graphics/android/android_display_configuration.h	2014-03-06 14:19:43 +0000
@@ -29,7 +29,7 @@
 class AndroidDisplayConfiguration : public graphics::DisplayConfiguration
 {
 public:
-    AndroidDisplayConfiguration(geometry::Size const& display_size);
+    AndroidDisplayConfiguration(DisplayConfigurationOutput&& output);
     AndroidDisplayConfiguration(AndroidDisplayConfiguration const& other);
     AndroidDisplayConfiguration& operator=(AndroidDisplayConfiguration const& other);
 

=== modified file 'src/platform/graphics/android/android_platform.cpp'
--- src/platform/graphics/android/android_platform.cpp	2014-02-04 23:20:36 +0000
+++ src/platform/graphics/android/android_platform.cpp	2014-03-06 14:19:43 +0000
@@ -29,9 +29,9 @@
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/buffer_id.h"
 #include "mir/graphics/buffer_ipc_packer.h"
+#include "mir/graphics/display_report.h"
 #include "mir/options/option.h"
 
-#include "mir/graphics/null_display_report.h"
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 

=== added file 'src/platform/graphics/android/configurable_display_buffer.h'
--- src/platform/graphics/android/configurable_display_buffer.h	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/android/configurable_display_buffer.h	2014-03-06 14:19:43 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2013 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: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_ANDROID_CONFIGURABLE_DISPLAY_BUFFER_H_
+#define MIR_GRAPHICS_ANDROID_CONFIGURABLE_DISPLAY_BUFFER_H_
+
+#include "mir/graphics/display_buffer.h"
+#include "mir/graphics/display_configuration.h"
+
+namespace mir
+{
+namespace graphics
+{
+namespace android
+{
+
+class ConfigurableDisplayBuffer : public graphics::DisplayBuffer
+{
+public:
+    virtual DisplayConfigurationOutput configuration() const = 0;
+    virtual void configure(DisplayConfigurationOutput const&) = 0;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_ANDROID_CONFIGURABLE_DISPLAY_BUFFER_H_ */

=== modified file 'src/platform/graphics/android/display_buffer.cpp'
--- src/platform/graphics/android/display_buffer.cpp	2014-01-23 17:26:51 +0000
+++ src/platform/graphics/android/display_buffer.cpp	2014-03-06 14:19:43 +0000
@@ -24,6 +24,7 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <algorithm>
+#include <sstream>
 
 namespace mg=mir::graphics;
 namespace mga=mir::graphics::android;
@@ -38,7 +39,23 @@
       display_device{display_device},
       native_window{native_window},
       gl_context{shared_gl_context, std::bind(mga::create_window_surface, std::placeholders::_1, std::placeholders::_2, native_window.get())},
-      rotation{mir_orientation_normal}
+      current_configuration{
+          mg::DisplayConfigurationOutputId{1},
+          mg::DisplayConfigurationCardId{0},
+          mg::DisplayConfigurationOutputType::lvds,
+          {
+              fb_bundle->fb_format()
+          },
+          {mg::DisplayConfigurationMode{fb_bundle->fb_size(),0.0f}},
+          0,
+          geom::Size{0,0}, //could use DPI information to fill this
+          true,
+          true,
+          geom::Point{0,0},
+          0,
+          fb_bundle->fb_format(),
+          mir_power_mode_on,
+          mir_orientation_normal}
 {
 }
 
@@ -48,8 +65,11 @@
     int width = size.width.as_int();
     int height = size.height.as_int();
 
-    if (rotation == mir_orientation_left || rotation == mir_orientation_right)
+    if (current_configuration.orientation == mir_orientation_left
+        || current_configuration.orientation == mir_orientation_right)
+    {
         std::swap(width, height);
+    }
 
     return {{0,0}, {width,height}};
 }
@@ -111,10 +131,47 @@
      * and let the renderer do it.
      * If and when we choose to implement HWC rotation, this may change.
      */
-    return rotation;
-}
-
-void mga::DisplayBuffer::orient(MirOrientation rot)
-{
-    rotation = rot;
+    return current_configuration.orientation;
+}
+
+mg::DisplayConfigurationOutput mga::DisplayBuffer::configuration() const
+{
+    return mg::DisplayConfigurationOutput(current_configuration);
+}
+
+void mga::DisplayBuffer::configure(DisplayConfigurationOutput const& new_configuration)
+{
+    //power mode
+    MirPowerMode intended_power_mode = new_configuration.power_mode;
+    if ((intended_power_mode == mir_power_mode_standby) ||
+        (intended_power_mode == mir_power_mode_suspend))
+    {
+        intended_power_mode = mir_power_mode_off;
+    }
+
+    if (intended_power_mode != current_configuration.power_mode)
+    {
+        display_device->mode(intended_power_mode);
+        current_configuration.power_mode = intended_power_mode;
+    }
+
+    //If the hardware can rotate for us, we report normal orientation. If it can't
+    //we preserve this orientation change so the compositor can rotate everything in GL 
+    if (display_device->apply_orientation(new_configuration.orientation))
+    {
+        current_configuration.orientation = mir_orientation_normal;
+    }
+    else
+    {
+        current_configuration.orientation = new_configuration.orientation;
+    }
+
+    //do not allow fb format reallocation
+    if (new_configuration.current_format != current_configuration.current_format)
+    {
+        std::stringstream err_msg; 
+        err_msg << std::string("could not change display buffer format to request: ")
+                << new_configuration.current_format;
+        BOOST_THROW_EXCEPTION(std::runtime_error(err_msg.str()));
+    }
 }

=== modified file 'src/platform/graphics/android/display_buffer.h'
--- src/platform/graphics/android/display_buffer.h	2014-02-06 13:30:26 +0000
+++ src/platform/graphics/android/display_buffer.h	2014-03-06 14:19:43 +0000
@@ -19,8 +19,9 @@
 #ifndef MIR_GRAPHICS_ANDROID_DISPLAY_BUFFER_H_
 #define MIR_GRAPHICS_ANDROID_DISPLAY_BUFFER_H_
 
-#include "mir/graphics/display_buffer.h"
+#include "configurable_display_buffer.h"
 #include "mir/graphics/egl_resources.h"
+#include "android_display_configuration.h"
 #include "gl_context.h"
 #include <system/window.h>
 
@@ -34,7 +35,7 @@
 class DisplayDevice;
 class FramebufferBundle;
 
-class DisplayBuffer : public graphics::DisplayBuffer
+class DisplayBuffer : public ConfigurableDisplayBuffer
 {
 public:
     DisplayBuffer(std::shared_ptr<FramebufferBundle> const& fb_bundle,
@@ -52,7 +53,9 @@
         std::list<std::shared_ptr<Renderable>> const& renderlist,
         std::function<void(Renderable const&)> const& render_fn);
     MirOrientation orientation() const override;
-    void orient(MirOrientation);
+
+    DisplayConfigurationOutput configuration() const;
+    void configure(DisplayConfigurationOutput const&);
 
 private:
     void render_and_post();
@@ -61,6 +64,8 @@
     std::shared_ptr<DisplayDevice> const display_device;
     std::shared_ptr<ANativeWindow> const native_window;
     GLContext gl_context;
+    bool prepared;
+    DisplayConfigurationOutput current_configuration;
     MirOrientation rotation;
 };
 

=== modified file 'src/platform/graphics/android/display_builder.h'
--- src/platform/graphics/android/display_builder.h	2014-01-13 06:12:33 +0000
+++ src/platform/graphics/android/display_builder.h	2014-03-06 14:19:43 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_DISPLAY_BUILDER_H_
 #define MIR_GRAPHICS_ANDROID_DISPLAY_BUILDER_H_
 
-#include "mir/graphics/display_buffer.h"
+#include "configurable_display_buffer.h"
 #include "mir_toolkit/common.h"
 #include <memory>
 
@@ -29,7 +29,6 @@
 {
 namespace android
 {
-class DisplayDevice;
 class GLContext;
 
 class DisplayBuilder
@@ -38,9 +37,7 @@
     virtual ~DisplayBuilder() = default;
 
     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,
+    virtual std::unique_ptr<ConfigurableDisplayBuffer> create_display_buffer(
         GLContext const& gl_context) = 0;
 
 protected:

=== modified file 'src/platform/graphics/android/display_device.h'
--- src/platform/graphics/android/display_device.h	2014-01-23 17:26:51 +0000
+++ src/platform/graphics/android/display_device.h	2014-03-06 14:19:43 +0000
@@ -44,6 +44,7 @@
     virtual void prepare_gl_and_overlays(std::list<std::shared_ptr<Renderable>> const& list) = 0; 
     virtual void gpu_render(EGLDisplay dpy, EGLSurface sur) = 0;
     virtual void post(Buffer const& buffer) = 0;
+    virtual bool apply_orientation(MirOrientation orientation) const = 0;
 
 protected:
     DisplayDevice() = default;

=== modified file 'src/platform/graphics/android/fb_device.cpp'
--- src/platform/graphics/android/fb_device.cpp	2014-01-23 17:26:51 +0000
+++ src/platform/graphics/android/fb_device.cpp	2014-03-06 14:19:43 +0000
@@ -69,6 +69,11 @@
     }
 }
 
+bool mga::FBDevice::apply_orientation(MirOrientation) const
+{
+    return false; 
+}
+
 void mga::FBDevice::mode(MirPowerMode mode)
 {
     int enable = 0;

=== modified file 'src/platform/graphics/android/fb_device.h'
--- src/platform/graphics/android/fb_device.h	2014-01-23 17:26:51 +0000
+++ src/platform/graphics/android/fb_device.h	2014-03-06 14:19:43 +0000
@@ -35,6 +35,7 @@
 public:
     FBDevice(std::shared_ptr<framebuffer_device_t> const& fbdev);
 
+    bool apply_orientation(MirOrientation orientation) const;
     void mode(MirPowerMode mode);
     void prepare_gl();
     void prepare_gl_and_overlays(std::list<std::shared_ptr<Renderable>> const& list); 

=== modified file 'src/platform/graphics/android/hwc_common_device.cpp'
--- src/platform/graphics/android/hwc_common_device.cpp	2014-01-13 06:12:33 +0000
+++ src/platform/graphics/android/hwc_common_device.cpp	2014-03-06 14:19:43 +0000
@@ -75,12 +75,10 @@
     std::unique_lock<std::mutex> lg(blanked_mutex);
     int err = 0;
 
-    //note: mir_power_mode_standby, mir_power_mode_suspend, mir_power_mode_off
-    //      are all treated like mir_power_mode_off
     if ((mode_request == mir_power_mode_suspend) ||
         (mode_request == mir_power_mode_standby))
     {
-        mode_request = mir_power_mode_off;
+        BOOST_THROW_EXCEPTION(std::runtime_error("cannot set to suspend or standby"));
     }
 
     if ((mode_request == mir_power_mode_on) &&
@@ -129,3 +127,8 @@
         return err;
     return hwc_device->blank(hwc_device.get(), HWC_DISPLAY_PRIMARY, 1);
 }
+
+bool mga::HWCCommonDevice::apply_orientation(MirOrientation) const
+{
+    return false; 
+}

=== modified file 'src/platform/graphics/android/hwc_common_device.h'
--- src/platform/graphics/android/hwc_common_device.h	2014-01-13 06:12:33 +0000
+++ src/platform/graphics/android/hwc_common_device.h	2014-03-06 14:19:43 +0000
@@ -48,6 +48,7 @@
 
     void notify_vsync();
     void mode(MirPowerMode mode);
+    bool apply_orientation(MirOrientation orientation) const;
 
 protected:
     HWCCommonDevice(std::shared_ptr<hwc_composer_device_1> const& hwc_device,

=== modified file 'src/platform/graphics/android/hwc_device.cpp'
--- src/platform/graphics/android/hwc_device.cpp	2014-01-29 18:54:06 +0000
+++ src/platform/graphics/android/hwc_device.cpp	2014-03-06 14:19:43 +0000
@@ -22,7 +22,6 @@
 #include "hwc_vsync_coordinator.h"
 #include "framebuffer_bundle.h"
 #include "buffer.h"
-#include "mir/graphics/android/sync_fence.h"
 #include "mir/graphics/android/native_buffer.h"
 #include "mir/graphics/buffer.h"
 
@@ -38,17 +37,23 @@
                           std::shared_ptr<HWCVsyncCoordinator> const& coordinator,
                           std::shared_ptr<SyncFileOps> const& sync_ops)
     : HWCCommonDevice(hwc_device, coordinator),
-      layer_list({mga::ForceGLLayer{}, mga::FramebufferLayer{}}),
       sync_ops(sync_ops)
 {
 }
 
 void mga::HwcDevice::prepare_gl()
 {
-    //note, although we only have a primary display right now,
-    //      set the external and virtual displays to null as some drivers check for that
-    hwc_display_contents_1_t* displays[num_displays] {layer_list.native_list(), nullptr, nullptr};
-    if (hwc_device->prepare(hwc_device.get(), 1, displays))
+    auto rc = 0;
+    auto display_list = layer_list.native_list().lock();
+    if (display_list)
+    {
+        //note, although we only have a primary display right now,
+        //      set the external and virtual displays to null as some drivers check for that
+        hwc_display_contents_1_t* displays[num_displays] {display_list.get(), nullptr, nullptr};
+        rc = hwc_device->prepare(hwc_device.get(), 1, displays);
+    }
+
+    if ((rc != 0) || (!display_list))
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc prepare()"));
     }
@@ -71,17 +76,24 @@
 {
     auto lg = lock_unblanked();
 
-    auto native_buffer = buffer.native_buffer_handle();
-    layer_list.set_fb_target(native_buffer);
-
-    hwc_display_contents_1_t* displays[num_displays] {layer_list.native_list(), nullptr, nullptr};
-    if (hwc_device->set(hwc_device.get(), 1, displays))
+    layer_list.set_fb_target(buffer);
+
+    auto rc = 0;
+    auto display_list = layer_list.native_list().lock();
+    if (display_list)
+    {
+        hwc_display_contents_1_t* displays[num_displays] {display_list.get(), nullptr, nullptr};
+        rc = hwc_device->set(hwc_device.get(), 1, displays);
+
+        mga::SyncFence retire_fence(sync_ops, layer_list.retirement_fence());
+
+        int framebuffer_fence = layer_list.fb_target_fence();
+        auto native_buffer = buffer.native_buffer_handle();
+        native_buffer->update_fence(framebuffer_fence);
+    }
+
+    if ((rc != 0) || (!display_list))
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc set()"));
     }
-
-    mga::SyncFence retire_fence(sync_ops, displays[HWC_DISPLAY_PRIMARY]->retireFenceFd);
-
-    int framebuffer_fence = layer_list.framebuffer_fence();
-    native_buffer->update_fence(framebuffer_fence);
 }

=== modified file 'src/platform/graphics/android/hwc_device.h'
--- src/platform/graphics/android/hwc_device.h	2014-02-06 13:30:26 +0000
+++ src/platform/graphics/android/hwc_device.h	2014-03-06 14:19:43 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_HWC_DEVICE_H_
 
 #include "mir_toolkit/common.h"
+#include "mir/graphics/android/sync_fence.h"
 #include "hwc_common_device.h"
 #include "hwc_layerlist.h"
 #include <memory>
@@ -48,7 +49,7 @@
     void post(Buffer const& buffer);
 
 private:
-    LayerList layer_list;
+    FBTargetLayerList layer_list;
 
     std::shared_ptr<SyncFileOps> const sync_ops;
     static size_t const num_displays{3}; //primary, external, virtual

=== modified file 'src/platform/graphics/android/hwc_fb_device.cpp'
--- src/platform/graphics/android/hwc_fb_device.cpp	2014-01-23 18:01:19 +0000
+++ src/platform/graphics/android/hwc_fb_device.cpp	2014-03-06 14:19:43 +0000
@@ -18,7 +18,6 @@
  */
 
 #include "hwc_fb_device.h"
-#include "hwc_layers.h"
 #include "hwc_vsync_coordinator.h"
 #include "framebuffer_bundle.h"
 #include "android_format_conversion-inl.h"
@@ -36,15 +35,21 @@
                               std::shared_ptr<framebuffer_device_t> const& fb_device,
                               std::shared_ptr<HWCVsyncCoordinator> const& coordinator)
     : HWCCommonDevice(hwc_device, coordinator),
-      fb_device(fb_device),
-      layer_list({mga::ForceGLLayer{}})
+      fb_device(fb_device)
 {
 }
 
 void mga::HwcFbDevice::prepare_gl()
 {
-    auto display_list = layer_list.native_list();
-    if (hwc_device->prepare(hwc_device.get(), 1, &display_list) != 0)
+    auto rc = 0;
+    auto display_list = layer_list.native_list().lock();
+    if (display_list)
+    {
+        hwc_display_contents_1_t* displays[num_displays] {display_list.get()};
+        rc = hwc_device->prepare(hwc_device.get(), num_displays, displays);
+    }
+
+    if ((rc != 0) || (!display_list))
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc prepare()"));
     }
@@ -57,13 +62,20 @@
 
 void mga::HwcFbDevice::gpu_render(EGLDisplay dpy, EGLSurface sur)
 {
-    auto display_list = layer_list.native_list();
-    display_list->dpy = dpy;
-    display_list->sur = sur;
-
-    //set() may affect EGL state by calling eglSwapBuffers.
-    //HWC 1.0 is the only version of HWC that can do this.
-    if (hwc_device->set(hwc_device.get(), 1, &display_list) != 0)
+    auto rc = 0; 
+    auto display_list = layer_list.native_list().lock();
+    if (display_list)
+    {
+        display_list->dpy = dpy;
+        display_list->sur = sur;
+
+        //set() may affect EGL state by calling eglSwapBuffers.
+        //HWC 1.0 is the only version of HWC that can do this.
+        hwc_display_contents_1_t* displays[num_displays] {display_list.get()};
+        rc = hwc_device->set(hwc_device.get(), num_displays, displays);
+    }
+
+    if ((rc != 0) || (!display_list))
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc set()"));
     }

=== modified file 'src/platform/graphics/android/hwc_fb_device.h'
--- src/platform/graphics/android/hwc_fb_device.h	2014-01-23 18:01:19 +0000
+++ src/platform/graphics/android/hwc_fb_device.h	2014-03-06 14:19:43 +0000
@@ -45,6 +45,7 @@
 
 private:
     std::shared_ptr<framebuffer_device_t> const fb_device;
+    static int const num_displays{1};
     LayerList layer_list;
 };
 

=== modified file 'src/platform/graphics/android/hwc_layerlist.cpp'
--- src/platform/graphics/android/hwc_layerlist.cpp	2014-01-23 18:01:19 +0000
+++ src/platform/graphics/android/hwc_layerlist.cpp	2014-03-06 14:19:43 +0000
@@ -16,6 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
+#include "mir/graphics/renderable.h"
+#include "mir/graphics/buffer.h"
 #include "mir/graphics/android/sync_fence.h"
 #include "mir/graphics/android/native_buffer.h"
 #include "hwc_layerlist.h"
@@ -26,52 +28,124 @@
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
-mga::LayerList::LayerList(std::initializer_list<HWCLayer> const& layer_list)
-{
-    auto struct_size = sizeof(hwc_display_contents_1_t) + sizeof(hwc_layer_1_t)*(layer_list.size());
-    hwc_representation = std::shared_ptr<hwc_display_contents_1_t>(
+namespace
+{
+std::shared_ptr<hwc_display_contents_1_t> generate_hwc_list(size_t needed_size)
+{
+    /* hwc layer list uses hwLayers[0] at the end of the struct */
+    auto struct_size = sizeof(hwc_display_contents_1_t) + sizeof(hwc_layer_1_t)*(needed_size);
+    auto new_hwc_representation = std::shared_ptr<hwc_display_contents_1_t>(
         static_cast<hwc_display_contents_1_t*>( ::operator new(struct_size)));
 
-    auto i = 0u;
-    for(auto& layer : layer_list)
-    {
-        hwc_representation->hwLayers[i++] = layer;
-    }
-    hwc_representation->numHwLayers = layer_list.size();
-    hwc_representation->retireFenceFd = -1;
-    hwc_representation->flags = HWC_GEOMETRY_CHANGED;
+    new_hwc_representation->numHwLayers = needed_size;
+    new_hwc_representation->retireFenceFd = -1;
+    new_hwc_representation->flags = HWC_GEOMETRY_CHANGED;
 
     //aosp exynos hwc in particular, checks that these fields are non-null in hwc1.1, although
     //these fields are deprecated in hwc1.1 and later.
-    hwc_representation->dpy = reinterpret_cast<void*>(0xDECAF);
-    hwc_representation->sur = reinterpret_cast<void*>(0xC0FFEE);
-
-}
-
-void mga::LayerList::set_fb_target(std::shared_ptr<NativeBuffer> const& native_buffer)
-{
-    if (hwc_representation->numHwLayers == 2)
-    {
-        if (hwc_representation->hwLayers[0].flags == HWC_SKIP_LAYER)
-        {
-            hwc_representation->hwLayers[0] = mga::ForceGLLayer(*native_buffer);
-        }
-
-        if (hwc_representation->hwLayers[1].compositionType == HWC_FRAMEBUFFER_TARGET)
-        {
-            hwc_representation->hwLayers[1] = mga::FramebufferLayer(*native_buffer);
-            hwc_representation->hwLayers[1].acquireFenceFd = native_buffer->copy_fence();
-        }
-    }
-}
-
-mga::NativeFence mga::LayerList::framebuffer_fence()
-{
-    auto fb_position = hwc_representation->numHwLayers - 1;
-    return hwc_representation->hwLayers[fb_position].releaseFenceFd;
-}
-
-hwc_display_contents_1_t* mga::LayerList::native_list() const
-{
-    return hwc_representation.get();
+    static int fake_egl_values = 0;
+    new_hwc_representation->dpy = &fake_egl_values;
+    new_hwc_representation->sur = &fake_egl_values;
+
+    return new_hwc_representation;
+}
+}
+
+void mga::LayerListBase::update_representation(size_t needed_size)
+{
+    std::shared_ptr<hwc_display_contents_1_t> new_hwc_representation;
+    std::list<HWCLayer> new_layers;
+
+    if (hwc_representation->numHwLayers != needed_size)
+    {
+        new_hwc_representation = generate_hwc_list(needed_size);
+    }
+    else
+    {
+        new_hwc_representation = hwc_representation;
+    }
+
+    for (auto i = 0u; i < needed_size; i++)
+    {
+        new_layers.emplace_back(mga::HWCLayer(new_hwc_representation, i));
+    }
+
+    std::swap(new_layers, layers);
+    hwc_representation = new_hwc_representation;
+}
+
+std::weak_ptr<hwc_display_contents_1_t> mga::LayerListBase::native_list()
+{
+    return hwc_representation;
+}
+
+mga::NativeFence mga::LayerListBase::retirement_fence()
+{
+    return hwc_representation->retireFenceFd;
+}
+
+mga::LayerListBase::LayerListBase(size_t initial_list_size)
+    : hwc_representation{generate_hwc_list(initial_list_size)}
+{
+    update_representation(initial_list_size);
+}
+
+mga::LayerList::LayerList()
+    : LayerListBase{1}
+{
+    layers.back().set_layer_type(mga::LayerType::skip);
+}
+
+mga::FBTargetLayerList::FBTargetLayerList()
+    : LayerListBase{2}
+{
+    layers.front().set_layer_type(mga::LayerType::skip);
+    layers.back().set_layer_type(mga::LayerType::framebuffer_target);
+}
+
+void mga::FBTargetLayerList::reset_composition_layers()
+{
+    update_representation(2);
+
+    layers.front().set_layer_type(mga::LayerType::skip);
+    layers.back().set_layer_type(mga::LayerType::framebuffer_target);
+
+    skip_layers_present = true;
+}
+
+void mga::FBTargetLayerList::set_composition_layers(std::list<std::shared_ptr<graphics::Renderable>> const& list)
+{
+    auto const needed_size = list.size() + 1;
+    update_representation(needed_size);
+
+    auto layers_it = layers.begin();
+    for(auto const& renderable : list)
+    {
+        layers_it->set_layer_type(mga::LayerType::gl_rendered);
+        layers_it->set_render_parameters(renderable->screen_position(), renderable->alpha_enabled());
+        layers_it->set_buffer(*renderable->buffer());
+        layers_it++;
+    }
+
+    layers_it->set_layer_type(mga::LayerType::framebuffer_target);
+    skip_layers_present = false;
+}
+
+
+void mga::FBTargetLayerList::set_fb_target(mg::Buffer const& buffer)
+{
+    geom::Rectangle const disp_frame{{0,0}, {buffer.size()}};
+    if (skip_layers_present)
+    {
+        layers.front().set_render_parameters(disp_frame, false);
+        layers.front().set_buffer(buffer);
+    }
+
+    layers.back().set_render_parameters(disp_frame, false);
+    layers.back().set_buffer(buffer);
+}
+
+mga::NativeFence mga::FBTargetLayerList::fb_target_fence()
+{
+   return layers.back().release_fence();
 }

=== modified file 'src/platform/graphics/android/hwc_layerlist.h'
--- src/platform/graphics/android/hwc_layerlist.h	2014-01-23 18:01:19 +0000
+++ src/platform/graphics/android/hwc_layerlist.h	2014-03-06 14:19:43 +0000
@@ -26,32 +26,57 @@
 #include <memory>
 #include <vector>
 #include <initializer_list>
+#include <list>
 
 namespace mir
 {
 namespace graphics
 {
 
-class NativeBuffer;
+class Renderable;
 class Buffer;
 
 namespace android
 {
 
-class LayerList
+class LayerListBase
 {
 public:
-    LayerList(std::initializer_list<HWCLayer> const& layers);
-
-    hwc_display_contents_1_t* native_list() const;
-
-    void set_fb_target(std::shared_ptr<NativeBuffer> const&);
-    NativeFence framebuffer_fence();
+    std::weak_ptr<hwc_display_contents_1_t> native_list();
+    NativeFence retirement_fence();
+
+protected:
+    LayerListBase(size_t initial_list_size);
+
+    void update_representation(size_t needed_size); 
+    std::list<HWCLayer> layers;
 
 private:
+    LayerListBase& operator=(LayerListBase const&) = delete;
+    LayerListBase(LayerListBase const&) = delete;
+
     std::shared_ptr<hwc_display_contents_1_t> hwc_representation;
 };
 
+class LayerList : public LayerListBase
+{
+public:
+    LayerList();
+};
+
+class FBTargetLayerList : public LayerListBase
+{
+public:
+    FBTargetLayerList();
+    void set_composition_layers(std::list<std::shared_ptr<graphics::Renderable>> const& list);
+    void reset_composition_layers(); 
+    NativeFence fb_target_fence();
+    void set_fb_target(Buffer const&);
+
+private:
+    bool skip_layers_present{true};
+};
+
 }
 }
 }

=== modified file 'src/platform/graphics/android/hwc_layers.cpp'
--- src/platform/graphics/android/hwc_layers.cpp	2014-02-06 13:30:26 +0000
+++ src/platform/graphics/android/hwc_layers.cpp	2014-03-06 14:19:43 +0000
@@ -22,55 +22,101 @@
 #include "mir/graphics/android/native_buffer.h"
 #include "hwc_layerlist.h"
 
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
 #include <cstring>
 
 namespace mg=mir::graphics;
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
-mga::HWCLayer& mga::HWCLayer::operator=(HWCLayer const& layer)
+mga::HWCLayer& mga::HWCLayer::operator=(HWCLayer && other)
 {
-    memcpy(static_cast<void*>(this),
-           static_cast<void const*>(&layer),
-           sizeof(HWCLayer));
-    this->visibleRegionScreen = {1, &this->visible_rect};
+    hwc_layer = other.hwc_layer;
+    hwc_list = std::move(other.hwc_list);
+    visible_rect = std::move(other.visible_rect);
     return *this;
 }
 
-mga::HWCLayer::HWCLayer(HWCLayer const& layer)
-{
-    memcpy(static_cast<void*>(this),
-           static_cast<void const*>(&layer),
-           sizeof(HWCLayer));
-    this->visibleRegionScreen = {1, &this->visible_rect};
+mga::HWCLayer::HWCLayer(HWCLayer && other)
+    : hwc_layer(std::move(other.hwc_layer)),
+      hwc_list(std::move(other.hwc_list)),
+      visible_rect(std::move(other.visible_rect))
+{
+}
+
+mga::HWCLayer::HWCLayer(std::shared_ptr<hwc_display_contents_1_t> list, size_t layer_index)
+    : hwc_layer(&list->hwLayers[layer_index]),
+      hwc_list(list)
+{
+    memset(hwc_layer, 0, sizeof(hwc_layer_1_t));
+    memset(&visible_rect, 0, sizeof(hwc_rect_t));
+
+    hwc_layer->hints = 0;
+    hwc_layer->transform = 0;
+    hwc_layer->acquireFenceFd = -1;
+    hwc_layer->releaseFenceFd = -1;
+    hwc_layer->blending = HWC_BLENDING_NONE;
+
+    hwc_layer->visibleRegionScreen.numRects=1;
+    hwc_layer->visibleRegionScreen.rects= &visible_rect;
 }
 
 mga::HWCLayer::HWCLayer(
-        int type,
-        buffer_handle_t buffer_handle,
-        geom::Rectangle position,
-        geom::Size buffer_size,
-        bool skip, bool alpha)
-{
-    (skip) ? flags = HWC_SKIP_LAYER : flags = 0;
-    (alpha) ? blending = HWC_BLENDING_COVERAGE : blending = HWC_BLENDING_NONE;
-    compositionType = type;
-    hints = 0;
-    transform = 0;
-    //TODO: acquireFenceFd should be buffer.fence()
-    acquireFenceFd = -1;
-    releaseFenceFd = -1;
-
-    sourceCrop = 
+    LayerType type,
+    geometry::Rectangle position,
+    bool alpha_enabled,
+    std::shared_ptr<hwc_display_contents_1_t> list,
+    size_t layer_index)
+     : HWCLayer(list, layer_index)
+{
+    set_layer_type(type);
+    set_render_parameters(position, alpha_enabled);
+}
+
+bool mga::HWCLayer::needs_gl_render() const
+{
+    return ((hwc_layer->compositionType == HWC_FRAMEBUFFER) || (hwc_layer->flags == HWC_SKIP_LAYER));
+}
+
+mga::NativeFence mga::HWCLayer::release_fence() const
+{
+    return hwc_layer->releaseFenceFd;
+}
+
+void mga::HWCLayer::set_layer_type(LayerType type)
+{
+    hwc_layer->flags = 0;
+    switch(type)
     {
-        0, 0,
-        buffer_size.width.as_int(),
-        buffer_size.height.as_int()
-    };
-
+        case mga::LayerType::skip:
+            hwc_layer->compositionType = HWC_FRAMEBUFFER;
+            hwc_layer->flags = HWC_SKIP_LAYER;
+        break;
+
+        case mga::LayerType::gl_rendered:
+            hwc_layer->compositionType = HWC_FRAMEBUFFER;
+        break;
+
+        case mga::LayerType::framebuffer_target:
+            hwc_layer->compositionType = HWC_FRAMEBUFFER_TARGET;
+        break;
+
+        case mga::LayerType::overlay: //driver is the only one who can set to overlay
+        default:
+            BOOST_THROW_EXCEPTION(std::logic_error("invalid layer type"));
+    }
+}
+
+void mga::HWCLayer::set_render_parameters(geometry::Rectangle position, bool alpha_enabled)
+{
+    if (alpha_enabled)
+        hwc_layer->blending = HWC_BLENDING_COVERAGE;
+    else
+        hwc_layer->blending = HWC_BLENDING_NONE;
 
     /* note, if the sourceCrop and DisplayFrame sizes differ, the output will be linearly scaled */
-    displayFrame = 
+    hwc_layer->displayFrame = 
     {
         position.top_left.x.as_int(),
         position.top_left.y.as_int(),
@@ -78,65 +124,21 @@
         position.size.height.as_int()
     };
 
-    visible_rect = displayFrame;
-    visibleRegionScreen.numRects=1;
-    visibleRegionScreen.rects= &visible_rect;
-
-    handle = buffer_handle;
-    memset(&reserved, 0, sizeof(reserved));
-}
-
-bool mga::HWCLayer::needs_gl_render() const
-{
-    return ((compositionType == HWC_FRAMEBUFFER) || (flags == HWC_SKIP_LAYER));
-}
-
-mga::FramebufferLayer::FramebufferLayer()
-    : HWCLayer(HWC_FRAMEBUFFER_TARGET,
-               nullptr,
-               geom::Rectangle{{0,0}, {0,0}},
-               geom::Size{0,0},
-               false,
-               false)
-{
-}
-
-mga::FramebufferLayer::FramebufferLayer(mg::NativeBuffer const& buffer)
-    : HWCLayer(HWC_FRAMEBUFFER_TARGET,
-               buffer.handle(),
-               geom::Rectangle{{0,0}, {buffer.anwb()->width, buffer.anwb()->height}},
-               geom::Size{buffer.anwb()->width, buffer.anwb()->height},
-               false,
-               false)
-{
-}
-
-mga::ForceGLLayer::ForceGLLayer()
-    : HWCLayer(HWC_FRAMEBUFFER,
-               nullptr,
-               geom::Rectangle{{0,0}, {0,0}},
-               geom::Size{0,0},
-               true,
-               false)
-{
-}
-
-mga::ForceGLLayer::ForceGLLayer(mg::NativeBuffer const& buffer)
-    : HWCLayer(HWC_FRAMEBUFFER,
-               buffer.handle(),
-               geom::Rectangle{{0,0}, {buffer.anwb()->width, buffer.anwb()->height}},
-               geom::Size{buffer.anwb()->width, buffer.anwb()->height},
-               true,
-               false)
-{
-}
-
-mga::CompositionLayer::CompositionLayer(mg::Renderable const& renderable)
-    : HWCLayer(HWC_FRAMEBUFFER,
-               renderable.buffer()->native_buffer_handle()->handle(),
-               renderable.screen_position(),
-               renderable.buffer()->size(),
-               false,
-               renderable.alpha_enabled())
-{
+    visible_rect = hwc_layer->displayFrame;
+}
+
+void mga::HWCLayer::set_buffer(Buffer const& buffer)
+{
+    auto size = buffer.size();
+    auto native_buffer = buffer.native_buffer_handle();
+    hwc_layer->handle = native_buffer->handle();
+    if (!needs_gl_render())
+        hwc_layer->acquireFenceFd = native_buffer->copy_fence();
+    hwc_layer->releaseFenceFd = -1;
+    hwc_layer->sourceCrop = 
+    {
+        0, 0,
+        size.width.as_int(),
+        size.height.as_int()
+    };
 }

=== modified file 'src/platform/graphics/android/hwc_layers.h'
--- src/platform/graphics/android/hwc_layers.h	2014-01-20 22:44:58 +0000
+++ src/platform/graphics/android/hwc_layers.h	2014-03-06 14:19:43 +0000
@@ -34,52 +34,46 @@
 {
 
 class Renderable;
-class NativeBuffer;
+class Buffer;
 
 namespace android
 {
 
-struct HWCLayer : public hwc_layer_1
-{
-    virtual ~HWCLayer() = default;
-
-    HWCLayer& operator=(HWCLayer const& layer);
-    HWCLayer(HWCLayer const& layer);
-
+enum LayerType
+{
+    gl_rendered,
+    overlay,
+    framebuffer_target,
+    skip
+};
+
+class HWCLayer
+{
+public:
+    HWCLayer(std::shared_ptr<hwc_display_contents_1_t> list, size_t layer_index);
+    HWCLayer(LayerType,
+             geometry::Rectangle screen_position,
+             bool alpha_enabled,
+             std::shared_ptr<hwc_display_contents_1_t> list, size_t layer_index);
+
+    HWCLayer& operator=(HWCLayer && layer);
+    HWCLayer(HWCLayer && layer);
+
+    HWCLayer& operator=(HWCLayer const& layer) = delete;
+    HWCLayer(HWCLayer const& layer) = delete;
+    
+    void set_layer_type(LayerType type);
+    void set_render_parameters(geometry::Rectangle screen_position, bool alpha_enabled);
+    void set_buffer(Buffer const&);
+
+    NativeFence release_fence() const;
     bool needs_gl_render() const;
 
-protected:
-    HWCLayer(
-        int type,
-        buffer_handle_t handle,
-        geometry::Rectangle position,
-        geometry::Size buffer_size,
-        bool skip, bool alpha
-    );
-
+private:
+    hwc_layer_1_t* hwc_layer;
+    std::shared_ptr<hwc_display_contents_1_t> hwc_list;
     hwc_rect_t visible_rect;
 };
-
-//layer could be GLES rendered, or overlaid by hwc.
-struct CompositionLayer : public HWCLayer
-{
-    CompositionLayer(graphics::Renderable const& renderable);
-};
-
-//used during compositions when we want to restrict to GLES render only
-struct ForceGLLayer : public HWCLayer
-{
-    ForceGLLayer();
-    ForceGLLayer(NativeBuffer const&);
-};
-
-//used as the target (lowest layer, fb)
-struct FramebufferLayer : public HWCLayer
-{
-    FramebufferLayer();
-    FramebufferLayer(NativeBuffer const&);
-};
-
 }
 }
 }

=== modified file 'src/platform/graphics/android/output_builder.cpp'
--- src/platform/graphics/android/output_builder.cpp	2014-02-04 23:20:36 +0000
+++ src/platform/graphics/android/output_builder.cpp	2014-03-06 14:19:43 +0000
@@ -63,7 +63,8 @@
     return framebuffers->fb_format();
 }
 
-std::shared_ptr<mga::DisplayDevice> mga::OutputBuilder::create_display_device()
+std::unique_ptr<mga::ConfigurableDisplayBuffer> mga::OutputBuilder::create_display_buffer(
+    GLContext const& gl_context)
 {
     std::shared_ptr<mga::DisplayDevice> device;
     if (force_backup_display)
@@ -98,14 +99,7 @@
         } 
     }
 
-    return device;
-}
-
-std::unique_ptr<mg::DisplayBuffer> mga::OutputBuilder::create_display_buffer(
-    std::shared_ptr<DisplayDevice> const& display_device,
-    GLContext const& gl_context)
-{
     auto native_window = res_factory->create_native_window(framebuffers);
-    return std::unique_ptr<mg::DisplayBuffer>(
-        new DisplayBuffer(framebuffers, display_device, native_window, gl_context));
+    return std::unique_ptr<mga::DisplayBuffer>(
+        new DisplayBuffer(framebuffers, device, native_window, gl_context));
 }

=== modified file 'src/platform/graphics/android/output_builder.h'
--- src/platform/graphics/android/output_builder.h	2014-02-04 23:20:36 +0000
+++ src/platform/graphics/android/output_builder.h	2014-03-06 14:19:43 +0000
@@ -33,6 +33,7 @@
 class FramebufferBundle;
 class DisplayResourceFactory;
 class GraphicBufferAllocator;
+class DisplayDevice;
 
 class OutputBuilder : public DisplayBuilder
 {
@@ -43,9 +44,7 @@
         std::shared_ptr<DisplayReport> const& display_report);
 
     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,
+    std::unique_ptr<ConfigurableDisplayBuffer> create_display_buffer(
         GLContext const& gl_context);
 
 private:

=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
--- src/platform/graphics/mesa/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-03-06 14:19:43 +0000
@@ -9,10 +9,11 @@
 # gbm.h and drm.h have trailing commas at the end of enum definitions
 # This is valid C99, but g++ 4.4 flags it as an error with -pedantic
 string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+add_definitions(-D__GBM__)
 
 
 add_library(
-  mirplatformgraphics SHARED
+  mirplatformgraphicsmesa SHARED
 
   platform.cpp
   buffer_allocator.cpp
@@ -37,8 +38,14 @@
   shm_buffer.cpp
 )
 
+set_target_properties(
+  mirplatformgraphicsmesa PROPERTIES
+  OUTPUT_NAME mirplatformgraphics
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
+)
+
 target_link_libraries(
-  mirplatformgraphics
+  mirplatformgraphicsmesa
   mirplatform
 
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -47,4 +54,13 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
-install(TARGETS mirplatformgraphics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if (MIR_TEST_PLATFORM STREQUAL "mesa")
+  add_custom_command(TARGET mirplatformgraphicsmesa
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so
+    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
+endif()
+
+install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)

=== modified file 'src/platform/graphics/mesa/display.cpp'
--- src/platform/graphics/mesa/display.cpp	2014-01-31 07:48:24 +0000
+++ src/platform/graphics/mesa/display.cpp	2014-03-06 14:19:43 +0000
@@ -134,6 +134,17 @@
         auto const& kms_conf = dynamic_cast<RealKMSDisplayConfiguration const&>(conf);
         std::vector<std::unique_ptr<DisplayBuffer>> display_buffers_new;
 
+        /*
+         * Notice for a little while here we will have duplicate
+         * DisplayBuffers attached to each output, and the display_buffers_new
+         * will take over the outputs before the old display_buffers are
+         * destroyed. So to avoid page flipping confusion in-between, make
+         * sure we wait for all pending page flips to finish before the
+         * display_buffers_new are created and take control of the outputs.
+         */
+        for (auto& db : display_buffers)
+            db->wait_for_page_flip();
+
         /* Reset the state of all outputs */
         kms_conf.for_each_output([&](DisplayConfigurationOutput const& conf_output)
         {

=== modified file 'src/platform/graphics/mesa/display_buffer.cpp'
--- src/platform/graphics/mesa/display_buffer.cpp	2014-01-23 17:26:51 +0000
+++ src/platform/graphics/mesa/display_buffer.cpp	2014-03-06 14:19:43 +0000
@@ -103,6 +103,7 @@
     MirOrientation rot,
     EGLContext shared_context)
     : last_flipped_bufobj{nullptr},
+      scheduled_bufobj{nullptr},
       platform(platform),
       listener(listener),
       drm(platform->drm),
@@ -110,7 +111,8 @@
       surface_gbm{std::move(surface_gbm_param)},
       area(area),
       rotation(rot),
-      needs_set_crtc{false}
+      needs_set_crtc{false},
+      page_flips_pending{false}
 {
     uint32_t area_width = area.size.width.as_uint32_t();
     uint32_t area_height = area.size.height.as_uint32_t();
@@ -142,13 +144,13 @@
 
     listener->report_successful_egl_buffer_swap_on_construction();
 
-    last_flipped_bufobj = get_front_buffer_object();
-    if (!last_flipped_bufobj)
+    scheduled_bufobj = get_front_buffer_object();
+    if (!scheduled_bufobj)
         BOOST_THROW_EXCEPTION(std::runtime_error("Failed to get frontbuffer"));
 
     for (auto& output : outputs)
     {
-        if (!output->set_crtc(last_flipped_bufobj->get_drm_fb_id()))
+        if (!output->set_crtc(scheduled_bufobj->get_drm_fb_id()))
             BOOST_THROW_EXCEPTION(std::runtime_error("Failed to set DRM crtc"));
     }
 
@@ -171,6 +173,9 @@
      */
     if (last_flipped_bufobj)
         last_flipped_bufobj->release();
+
+    if (scheduled_bufobj)
+        scheduled_bufobj->release();
 }
 
 geom::Rectangle mgm::DisplayBuffer::view_area() const
@@ -206,6 +211,31 @@
     std::shared_ptr<graphics::Buffer> bypass_buf)
 {
     /*
+     * If the last frame was composited then we haven't waited for the
+     * page flips yet. This is good because it maximizes the time available
+     * to spend rendering each frame. However we have to wait here, because
+     * it will be unsafe to swap_buffers before guaranteeing the previous
+     * page flip finished.
+     */
+    wait_for_page_flip();
+
+    /*
+     * Switching from bypass to compositing? Now is the earliest safe time
+     * we can unreference the bypass buffer...
+     */
+    if (scheduled_bufobj)
+        last_flipped_bypass_buf = nullptr;
+    /*
+     * Release the last flipped buffer object (which is not displayed anymore)
+     * to make it available for future rendering.
+     */
+    if (last_flipped_bufobj)
+        last_flipped_bufobj->release();
+
+    last_flipped_bufobj = scheduled_bufobj;
+    scheduled_bufobj = nullptr;
+
+    /*
      * Bring the back buffer to the front and get the buffer object
      * corresponding to the front buffer.
      */
@@ -234,7 +264,7 @@
      * If the flip fails, release the buffer object to make it available
      * for future rendering.
      */
-    if (!needs_set_crtc && !schedule_and_wait_for_page_flip(bufobj))
+    if (!needs_set_crtc && !schedule_page_flip(bufobj))
     {
         if (!bypass_buf)
             bufobj->release();
@@ -250,22 +280,32 @@
         needs_set_crtc = false;
     }
 
-    /*
-     * Release the last flipped buffer object (which is not displayed anymore)
-     * to make it available for future rendering.
-     */
-    if (last_flipped_bufobj)
-        last_flipped_bufobj->release();
-
-    last_flipped_bufobj = bypass_buf ? nullptr : bufobj;
-
-    /*
-     * Keep a reference to the buffer being bypassed for the entire duration
-     * of the frame. This ensures the buffer doesn't get reused by the client
-     * prematurely, which would be seen as tearing.
-     * If not bypassing, then bypass_buf will be nullptr.
-     */
-    last_flipped_bypass_buf = bypass_buf;
+    if (bypass_buf)
+    {
+        /*
+         * For composited frames we defer wait_for_page_flip till just before
+         * the next frame, but not for bypass frames. Deferring the flip of
+         * bypass frames would increase the time we held
+         * last_flipped_bypass_buf unacceptably, resulting in client stuttering
+         * unless we allocate quad-buffers (which I'm trying to avoid).
+         * Also, bypass does not need the deferred page flip because it has
+         * no compositing/rendering step for which to save time for.
+         */
+        wait_for_page_flip();
+        scheduled_bufobj = nullptr;
+
+        /*
+         * Keep a reference to the buffer being bypassed for the entire
+         * duration of the frame. This ensures the buffer doesn't get reused by
+         * the client while its on-screen, which would be seen as tearing or