← Back to branch summary

~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

  • Committer: Robert Carr
  • Date: 2013-08-13 18:30:53 UTC
  • Revision ID: robert.carr@canonical.com-20130813183053-pp2hzgm46uvmc4x8
Revert to r762

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp
51
51
public:
52
52
    void apply_to(mg::DisplayConfiguration& conf)
53
53
    {
 
54
        size_t const preferred_mode_index{0};
 
55
 
54
56
        conf.for_each_output(
55
57
            [&](mg::DisplayConfigurationOutput const& conf_output)
56
58
            {
57
59
                if (conf_output.connected && conf_output.modes.size() > 0)
58
60
                {
59
61
                    conf.configure_output(conf_output.id, true, geom::Point{0, 0},
60
 
                                          conf_output.preferred_mode_index);
 
62
                                          preferred_mode_index);
61
63
                }
62
64
                else
63
65
                {
73
75
public:
74
76
    void apply_to(mg::DisplayConfiguration& conf)
75
77
    {
 
78
        size_t const preferred_mode_index{0};
76
79
        int max_x = 0;
77
80
 
78
81
        conf.for_each_output(
81
84
                if (conf_output.connected && conf_output.modes.size() > 0)
82
85
                {
83
86
                    conf.configure_output(conf_output.id, true, geom::Point{max_x, 0},
84
 
                                          conf_output.preferred_mode_index);
85
 
                    max_x += conf_output.modes[conf_output.preferred_mode_index].size.width.as_int();
 
87
                                          preferred_mode_index);
 
88
                    max_x += conf_output.modes[0].size.width.as_int();
86
89
                }
87
90
                else
88
91
                {
149
152
 
150
153
    void setup_outputs(int n)
151
154
    {
152
 
        using fake = mtd::FakeDRMResources;
153
 
 
154
155
        mtd::FakeDRMResources& resources(mock_drm.fake_drm);
155
156
 
156
157
        modes0.clear();
157
 
        modes0.push_back(fake::create_mode(1920, 1080, 138500, 2080, 1111, fake::NormalMode));
158
 
        modes0.push_back(fake::create_mode(1920, 1080, 148500, 2200, 1125, fake::PreferredMode));
159
 
        modes0.push_back(fake::create_mode(1680, 1050, 119000, 1840, 1080, fake::NormalMode));
160
 
        modes0.push_back(fake::create_mode(832, 624, 57284, 1152, 667, fake::NormalMode));
 
158
        modes0.push_back(mtd::FakeDRMResources::create_mode(1920, 1080, 138500, 2080, 1111));
 
159
        modes0.push_back(mtd::FakeDRMResources::create_mode(1920, 1080, 148500, 2200, 1125));
 
160
        modes0.push_back(mtd::FakeDRMResources::create_mode(1680, 1050, 119000, 1840, 1080));
 
161
        modes0.push_back(mtd::FakeDRMResources::create_mode(832, 624, 57284, 1152, 667));
161
162
 
162
163
        geom::Size const connector_physical_size_mm{1597, 987};
163
164
 
185
186
            uint32_t const connector_id{connector_base_id + i};
186
187
 
187
188
            connector_ids.push_back(connector_id);
188
 
            resources.add_connector(connector_id, DRM_MODE_CONNECTOR_VGA,
189
 
                                    DRM_MODE_CONNECTED, encoder_ids[i],
 
189
            resources.add_connector(connector_id, DRM_MODE_CONNECTED, encoder_ids[i],
190
190
                                    modes0, encoder_ids, connector_physical_size_mm);
191
191
        }
192
192