Merge lp:~vanvugt/mir/set-logical-size into lp:mir

[Daniel van Vugt]

Add the ability to set the logical size/resolution of an output,
independently of its physical resolution.

That's another big step in LP: #1639226, almost done.

=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
--- include/client/mir_toolkit/mir_display_configuration.h	2017-02-17 08:46:05 +0000
+++ include/client/mir_toolkit/mir_display_configuration.h	2017-04-13 08:26:06 +0000
@@ -333,6 +333,20 @@
 unsigned int mir_output_get_logical_height(MirOutput const* output);
 
 /**
+ * Set the logical size of the virtual display space occupied by an output.
+ * By default this is the dimensions of the output's current mode, but you
+ * can now set it to an arbitrary size and the compositor will scale
+ * accordingly.
+ *
+ * \param [in] output  The output to modify
+ * \param [in] w       The width in logical view area pixels, or zero to
+ *                     revert to the current display mode dimensions.
+ * \param [in] h       The height in logical view area pixels, or zero to
+ *                     revert to the current display mode dimensions.
+ */
+void mir_output_set_logical_size(MirOutput* output, unsigned w, unsigned h);
+
+/**
  * Set the coordinates of the top-left point of the output in the virtual
  * display space.
  *

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2017-01-18 02:29:37 +0000
+++ include/platform/mir/graphics/display_configuration.h	2017-04-13 08:26:06 +0000
@@ -24,8 +24,11 @@
 #include "mir/geometry/rectangle.h"
 #include "mir/geometry/point.h"
 #include "mir/graphics/gamma_curves.h"
+#include "mir/optional_value.h"
 #include "mir_toolkit/common.h"
 
+#include <glm/glm.hpp>
+
 #include <functional>
 #include <vector>
 #include <memory>
@@ -130,10 +133,18 @@
     /** EDID of the display, if non-empty */
     std::vector<uint8_t> edid;
 
+    mir::optional_value<geometry::Size> custom_logical_size;
+
     /** The logical rectangle occupied by the output, based on its position,
         current mode and orientation (rotation) */
     geometry::Rectangle extents() const;
     bool valid() const;
+
+    /**
+     * The transformation required to map this output's logical view area
+     * (returned by extents()) on to the output's current mode.
+     */
+    glm::mat2 transformation() const;
 };
 
 /**
@@ -162,6 +173,7 @@
     GammaCurves& gamma;
     MirOutputGammaSupported const& gamma_supported;
     std::vector<uint8_t const> const& edid;
+    mir::optional_value<geometry::Size>& custom_logical_size;
 
     UserDisplayConfigurationOutput(DisplayConfigurationOutput& master);
     geometry::Rectangle extents() const;

=== modified file 'src/client/display_configuration_api.cpp'
--- src/client/display_configuration_api.cpp	2017-02-17 08:46:05 +0000
+++ src/client/display_configuration_api.cpp	2017-04-13 08:26:06 +0000
@@ -261,6 +261,19 @@
     return output->logical_height();
 }
 
+void mir_output_set_logical_size(MirOutput* output, unsigned w, unsigned h)
+{
+    if (w)
+        output->set_logical_width(w);
+    else
+        output->clear_logical_width();
+
+    if (h)
+        output->set_logical_height(h);
+    else
+        output->clear_logical_height();
+}
+
 void mir_output_set_position(MirOutput* output, int x, int y)
 {
     output->set_position_x(x);

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2017-04-13 04:26:20 +0000
+++ src/client/symbols.map	2017-04-13 08:26:06 +0000
@@ -579,7 +579,7 @@
     };
 } MIR_CLIENT_DETAIL_0.26.1;
 
-MIR_CLIENT_0.27 {  # New functions in Mir 0.27 or 1.0
+MIR_CLIENT_0.27 {  # New functions in Mir 0.27
   global:
     mir_connection_apply_session_input_config;
     mir_connection_set_base_input_config;
@@ -611,3 +611,8 @@
     mir_touchscreen_config_set_mapping_mode;
     mir_touchscreen_config_set_output_id;
 } MIR_CLIENT_0.26.1;
+
+MIR_CLIENT_0.28 {  # New functions in Mir 0.28
+  global:
+    mir_output_set_logical_size;
+} MIR_CLIENT_0.27;

=== modified file 'src/platform/graphics/display_configuration.cpp'
--- src/platform/graphics/display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ src/platform/graphics/display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -18,6 +18,7 @@
 
 #include "mir/graphics/display_configuration.h"
 #include "mir/output_type_names.h"
+#include "mir/graphics/transformation.h"
 
 #include <ostream>
 #include <algorithm>
@@ -243,7 +244,28 @@
 
 mir::geometry::Rectangle mg::DisplayConfigurationOutput::extents() const
 {
-    return extents_of(modes, current_mode_index, orientation, top_left);
+    return custom_logical_size.is_set() ?
+           mir::geometry::Rectangle(top_left, custom_logical_size.value()) :
+           extents_of(modes, current_mode_index, orientation, top_left);
+}
+
+glm::mat2 mg::DisplayConfigurationOutput::transformation() const
+{
+    auto rot = mg::transformation(orientation);
+
+    if (!custom_logical_size.is_set())
+        return rot;
+
+    auto const& physical_size = extents_of(modes, current_mode_index,
+                                           orientation, top_left).size;
+    auto const& logical_size = custom_logical_size.value();
+
+    float scale_x = static_cast<float>(physical_size.width.as_int()) /
+                    logical_size.width.as_int();
+    float scale_y = static_cast<float>(physical_size.height.as_int()) /
+                    logical_size.height.as_int();
+
+    return glm::mat2(scale_x, 0, 0, scale_y) * rot;
 }
 
 bool mg::DisplayConfigurationOutput::valid() const
@@ -260,6 +282,13 @@
     if (current_mode_index >= nmodes)
         return false;
 
+    if (custom_logical_size.is_set())
+    {
+        auto const& logical_size = custom_logical_size.value();
+        if (!logical_size.width.as_int() || !logical_size.height.as_int())
+            return false;
+    }
+
     return true;
 }
 
@@ -297,13 +326,16 @@
         subpixel_arrangement(master.subpixel_arrangement),
         gamma(master.gamma),
         gamma_supported(master.gamma_supported),
-        edid(*reinterpret_cast<std::vector<uint8_t const>*>(&master.edid))
+        edid(*reinterpret_cast<std::vector<uint8_t const>*>(&master.edid)),
+        custom_logical_size(master.custom_logical_size)
 {
 }
 
 mir::geometry::Rectangle mg::UserDisplayConfigurationOutput::extents() const
 {
-    return extents_of(modes, current_mode_index, orientation, top_left);
+    return custom_logical_size.is_set() ?
+           mir::geometry::Rectangle(top_left, custom_logical_size.value()) :
+           extents_of(modes, current_mode_index, orientation, top_left);
 }
 
 

=== modified file 'src/platform/graphics/overlapping_output_grouping.cpp'
--- src/platform/graphics/overlapping_output_grouping.cpp	2015-02-22 07:46:25 +0000
+++ src/platform/graphics/overlapping_output_grouping.cpp	2017-04-13 08:26:06 +0000
@@ -112,11 +112,11 @@
             {
                 /*
                  * Prevent grouping of outputs when they have differing
-                 * orientations. It's safer to assume the hardware can't
+                 * transformations. It's safer to assume the hardware can't
                  * handle it for now... until proven otherwise.
                  */
                 if (conf_o.extents().overlaps(rect_output) &&
-                    conf_o.orientation == conf_output.orientation)
+                    conf_o.transformation() == conf_output.transformation())
                     found_overlap = true;
             });
 

=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2017-04-05 03:11:28 +0000
+++ src/platform/symbols.map	2017-04-13 08:26:06 +0000
@@ -159,3 +159,10 @@
   };
  local: *;
 };
+
+MIRPLATFORM_0.28 {
+ global:
+  extern "C++" {
+    mir::graphics::DisplayConfigurationOutput::transformation*;
+  };
+} MIRPLATFORM_0.27;

=== modified file 'src/platforms/android/server/display.cpp'
--- src/platforms/android/server/display.cpp	2017-04-05 03:11:28 +0000
+++ src/platforms/android/server/display.cpp	2017-04-13 08:26:06 +0000
@@ -133,7 +133,7 @@
         native_window,
         gl_context,
         *gl_program_factory,
-        mg::transformation(config.orientation),
+        config.transformation(),
         config.extents(),
         overlay_option));
 }
@@ -398,7 +398,7 @@
             config[output.id].scale = output.scale;
             config[output.id].top_left = output.top_left;
 
-            auto const& transform = mg::transformation(output.orientation);
+            auto const& transform = output.transformation();
 
             if (config.primary().id == output.id)
             {

=== modified file 'src/platforms/android/server/display_configuration.cpp'
--- src/platforms/android/server/display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/server/display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -69,6 +69,7 @@
         subpixel_arrangement,
         {},
         mir_output_gamma_unsupported,
+        {},
         {}
     };
 }

=== modified file 'src/platforms/android/server/fb_device.cpp'
--- src/platforms/android/server/fb_device.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/server/fb_device.cpp	2017-04-13 08:26:06 +0000
@@ -92,6 +92,7 @@
         mir_subpixel_arrangement_unknown,
         {},
         mir_output_gamma_unsupported,
+        {},
         {}
     };
 }

=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
--- src/platforms/android/server/hwc_blanking_control.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/android/server/hwc_blanking_control.cpp	2017-04-13 08:26:06 +0000
@@ -179,6 +179,7 @@
         mir_subpixel_arrangement_unknown,
         {},
         mir_output_gamma_unsupported,
+        {},
         {}
     };
 }

=== modified file 'src/platforms/eglstream-kms/server/display.cpp'
--- src/platforms/eglstream-kms/server/display.cpp	2017-04-05 03:11:28 +0000
+++ src/platforms/eglstream-kms/server/display.cpp	2017-04-13 08:26:06 +0000
@@ -126,7 +126,7 @@
           ctx{create_context(dpy, config, ctx)},
           layer{output.output_layer()},
           view_area_{output.extents()},
-          transform{mg::transformation(output.orientation)}
+          transform{output.transformation()}
     {
         EGLint const stream_attribs[] = {
             EGL_STREAM_FIFO_LENGTH_KHR, 1,

=== modified file 'src/platforms/mesa/server/kms/display.cpp'
--- src/platforms/mesa/server/kms/display.cpp	2017-04-05 03:11:28 +0000
+++ src/platforms/mesa/server/kms/display.cpp	2017-04-13 08:26:06 +0000
@@ -521,7 +521,7 @@
             auto bounding_rect = group.bounding_rectangle();
             // Each vector<KMSOutput> is a single GPU memory domain
             std::vector<std::vector<std::shared_ptr<KMSOutput>>> kms_output_groups;
-            MirOrientation orientation = mir_orientation_normal;
+            glm::mat2 transformation;
 
             group.for_each_output(
                 [&](DisplayConfigurationOutput const& conf_output)
@@ -539,16 +539,12 @@
                     }
 
                     /*
-                    * Presently OverlappingOutputGroup guarantees all grouped
-                    * outputs have the same orientation.
-                    */
-                    orientation = conf_output.orientation;
+                     * Presently OverlappingOutputGroup guarantees all grouped
+                     * outputs have the same transformation.
+                     */
+                    transformation = conf_output.transformation();
                 });
 
-            // TODO in future outputs should emit transformation instead of
-            //      orientation
-            auto const transformation = mg::transformation(orientation);
-
             if (comp)
             {
                 display_buffers[group_idx++]->set_transformation(transformation,

=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
--- src/platforms/mesa/server/x11/graphics/display.cpp	2017-04-05 03:11:28 +0000
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2017-04-13 08:26:06 +0000
@@ -289,12 +289,14 @@
             std::logic_error("Invalid or inconsistent display configuration"));
     }
 
+    glm::mat2 trans;
     MirOrientation o = mir_orientation_normal;
     float new_scale = scale;
     geom::Rectangle logical_area;
 
     new_configuration.for_each_output([&](DisplayConfigurationOutput const& conf_output)
     {
+        trans = conf_output.transformation();
         o = conf_output.orientation;
         new_scale = conf_output.scale;
         logical_area = conf_output.extents();
@@ -302,7 +304,7 @@
 
     orientation = o;
     display_buffer->set_view_area(logical_area);
-    display_buffer->set_transformation(mg::transformation(orientation));
+    display_buffer->set_transformation(trans);
     scale = new_scale;
 }
 

=== modified file 'src/platforms/mesa/server/x11/graphics/display_configuration.cpp'
--- src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -48,6 +48,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}},
     card{mg::DisplayConfigurationCardId{0}, 1}
 {

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2017-04-13 04:26:20 +0000
+++ src/server/frontend/session_mediator.cpp	2017-04-13 08:26:06 +0000
@@ -1273,6 +1273,12 @@
         dest.gamma = {convert_string_to_gamma_curve(src.gamma_red()),
                       convert_string_to_gamma_curve(src.gamma_green()),
                       convert_string_to_gamma_curve(src.gamma_blue())};
+
+        if (src.has_logical_width() && src.has_logical_height())
+        {
+            dest.custom_logical_size = {src.logical_width(),
+                                        src.logical_height()};
+        }
     });
 
     return config;

=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
--- src/server/graphics/nested/nested_display_configuration.cpp	2017-03-13 09:09:22 +0000
+++ src/server/graphics/nested/nested_display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -133,7 +133,9 @@
         local_config.subpixel_arrangement,
         local_config.gamma,
         local_config.gamma_supported,
-        std::move(edid)
+        std::move(edid),
+        geometry::Size{mir_output_get_logical_width(output),
+                       mir_output_get_logical_height(output)}
     };
 }
 

=== modified file 'src/server/graphics/offscreen/display_configuration.cpp'
--- src/server/graphics/offscreen/display_configuration.cpp	2017-03-09 12:47:27 +0000
+++ src/server/graphics/offscreen/display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -40,6 +40,7 @@
                  mir_subpixel_arrangement_unknown,
                  {},
                  mir_output_gamma_unsupported,
+                 {},
                  {}},
           card{mg::DisplayConfigurationCardId{0}, 1}
 {

=== modified file 'tests/acceptance-tests/test_latency.cpp'
--- tests/acceptance-tests/test_latency.cpp	2017-04-11 14:13:20 +0000
+++ tests/acceptance-tests/test_latency.cpp	2017-04-13 08:26:06 +0000
@@ -255,6 +255,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         };
         outputs.push_back(output);

=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
--- tests/acceptance-tests/test_new_display_configuration.cpp	2017-04-13 04:26:20 +0000
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -934,6 +934,61 @@
     client.disconnect();
 }
 
+TEST_F(DisplayConfigurationTest, client_can_set_logical_size)
+{
+    DisplayClient client{new_connection()};
+
+    client.connect();
+
+    auto client_config = client.get_base_config();
+    int num_outputs = mir_display_config_get_num_outputs(client_config.get());
+
+    for (int i = 0; i < num_outputs; ++i)
+    {
+        auto output =
+            mir_display_config_get_mutable_output(client_config.get(), i);
+        mir_output_set_logical_size(output, (i+1)*123, (i+3)*345);
+    }
+
+    DisplayConfigMatchingContext context;
+    context.matcher = [c = client_config.get()](MirDisplayConfig* conf)
+        {
+            EXPECT_THAT(conf, mt::DisplayConfigMatches(c));
+        };
+
+    mir_connection_set_display_config_change_callback(
+        client.connection,
+        &new_display_config_matches,
+        &context);
+
+    mir_connection_preview_base_display_configuration(client.connection,
+                                                      client_config.get(), 10);
+
+    EXPECT_TRUE(context.done.wait_for(std::chrono::seconds(30)));
+
+    mir_connection_confirm_base_display_configuration(client.connection,
+                                                      client_config.get());
+
+    std::shared_ptr<mg::DisplayConfiguration> current_config =
+        server.the_display()->configuration();
+
+    int j = 0;
+    current_config->for_each_output(
+        [&j](mg::UserDisplayConfigurationOutput& output) mutable
+        {
+            ASSERT_TRUE(output.custom_logical_size.is_set());
+            auto const& size = output.custom_logical_size.value();
+            int w = size.width.as_int();
+            int h = size.height.as_int();
+            EXPECT_EQ((j+1)*123, w);
+            EXPECT_EQ((j+3)*345, h);
+            ++j;
+        });
+
+    EXPECT_TRUE(j);
+
+    client.disconnect();
+}
 
 TEST_F(DisplayConfigurationTest, client_sees_server_set_form_factor)
 {

=== modified file 'tests/mir_test/display_config_matchers.cpp'
--- tests/mir_test/display_config_matchers.cpp	2017-01-27 04:57:53 +0000
+++ tests/mir_test/display_config_matchers.cpp	2017-04-13 08:26:06 +0000
@@ -75,6 +75,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             };
 
@@ -134,6 +135,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             };
 
@@ -192,6 +194,7 @@
                     mir_subpixel_arrangement_unknown,
                     {},
                     mir_output_gamma_unsupported,
+                    {},
                     {}
                 };
 

=== modified file 'tests/mir_test_doubles/stub_display_configuration.cpp'
--- tests/mir_test_doubles/stub_display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ tests/mir_test_doubles/stub_display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -93,6 +93,7 @@
             subpixel_arrangement,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         }
 {
@@ -122,6 +123,7 @@
         mir_subpixel_arrangement_unknown,
         {},
         mir_output_gamma_unsupported,
+        {},
         {}
     }
 {
@@ -225,6 +227,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         };
 
@@ -252,6 +255,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             };
 

=== modified file 'tests/unit-tests/graphics/test_default_display_configuration_policy.cpp'
--- tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2017-01-30 05:18:36 +0000
+++ tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2017-04-13 08:26:06 +0000
@@ -65,6 +65,7 @@
         mir_subpixel_arrangement_unknown,
         {},
         mir_output_gamma_unsupported,
+        {},
         {}
     };
 }

=== modified file 'tests/unit-tests/graphics/test_display_configuration.cpp'
--- tests/unit-tests/graphics/test_display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/graphics/test_display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -53,6 +53,7 @@
     mir_subpixel_arrangement_unknown,
     {},
     mir_output_gamma_unsupported,
+    {},
     {}
 };
 
@@ -286,6 +287,36 @@
     EXPECT_EQ(out.modes[out.current_mode_index].size, out.extents().size);
 }
 
+TEST(DisplayConfiguration, output_extents_are_customizable)
+{
+    mg::DisplayConfigurationOutput out = tmpl_output;
+
+    geom::Size const custom_size{1234, 9876};
+    out.custom_logical_size = custom_size;
+
+    EXPECT_EQ(custom_size, out.extents().size);
+}
+
+TEST(DisplayConfiguration, custom_size_causes_scaling)
+{
+    mg::DisplayConfigurationOutput out = tmpl_output;
+
+    auto const& physical_size = out.modes[out.current_mode_index].size;
+
+    geom::Size const logical_size{1234, 9876};
+    out.custom_logical_size = logical_size;
+
+    auto const& observed = out.transformation();
+    glm::mat2 const expected{static_cast<float>(physical_size.width.as_int()) /
+                             logical_size.width.as_int(),
+                             0,
+                             0,
+                             static_cast<float>(physical_size.height.as_int()) /
+                             logical_size.height.as_int()};
+
+    EXPECT_EQ(expected, observed);
+}
+
 TEST(DisplayConfiguration, output_extents_rotates_with_orientation)
 {
     mg::DisplayConfigurationOutput out = tmpl_output;
@@ -329,6 +360,23 @@
     EXPECT_FALSE(out.valid());
 }
 
+TEST(DisplayConfiguration, only_nonzero_custom_sizes_are_valid)
+{
+    mg::DisplayConfigurationOutput out = tmpl_output;
+
+    out.custom_logical_size = {12, 34};
+    EXPECT_TRUE(out.valid());
+
+    out.custom_logical_size = {0, 56};
+    EXPECT_FALSE(out.valid());
+
+    out.custom_logical_size = {78, 0};
+    EXPECT_FALSE(out.valid());
+
+    out.custom_logical_size = {0, 0};
+    EXPECT_FALSE(out.valid());
+}
+
 TEST(DisplayConfiguration, unsupported_format_invalid)
 {
     mg::DisplayConfigurationOutput out = tmpl_output;

=== modified file 'tests/unit-tests/graphics/test_overlapping_output_grouping.cpp'
--- tests/unit-tests/graphics/test_overlapping_output_grouping.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/graphics/test_overlapping_output_grouping.cpp	2017-04-13 08:26:06 +0000
@@ -100,6 +100,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             };
 

=== modified file 'tests/unit-tests/platforms/mesa/kms/test_cursor.cpp'
--- tests/unit-tests/platforms/mesa/kms/test_cursor.cpp	2017-03-10 10:20:24 +0000
+++ tests/unit-tests/platforms/mesa/kms/test_cursor.cpp	2017-04-13 08:26:06 +0000
@@ -121,6 +121,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             },
             {
@@ -146,6 +147,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             },
             {
@@ -171,6 +173,7 @@
                 mir_subpixel_arrangement_unknown,
                 {},
                 mir_output_gamma_unsupported,
+                {},
                 {}
             }}}
     {

=== modified file 'tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp'
--- tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp	2017-04-05 03:11:28 +0000
+++ tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp	2017-04-13 08:26:06 +0000
@@ -300,6 +300,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
         {
@@ -322,6 +323,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
         {
@@ -344,6 +346,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         }
     };
@@ -577,6 +580,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
         {
@@ -599,6 +603,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
     };
@@ -625,6 +630,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
         {
@@ -647,6 +653,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
     };
@@ -794,6 +801,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
     };
@@ -822,6 +830,7 @@
             mir_subpixel_arrangement_unknown,
             {},
             mir_output_gamma_unsupported,
+            {},
             {}
         },
     };

=== modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
--- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-02-17 07:35:08 +0000
+++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-04-13 08:26:06 +0000
@@ -83,6 +83,10 @@
     output->set_edid(valid_edid, sizeof(valid_edid));
     output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
 
+    auto const& current_mode = output->mode(output->current_mode());
+    output->set_logical_width(current_mode.horizontal_resolution());
+    output->set_logical_height(current_mode.vertical_resolution());
+
     return std::make_shared<MirDisplayConfig>(conf);
 }
 
@@ -123,6 +127,10 @@
         output->set_orientation(mir_orientation_normal);
         output->set_edid(valid_edid, sizeof(valid_edid));
         output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
+
+        auto const& current_mode = output->mode(output->current_mode());
+        output->set_logical_width(current_mode.horizontal_resolution());
+        output->set_logical_height(current_mode.vertical_resolution());
     }
 
     return std::make_shared<MirDisplayConfig>(conf);