← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-02-04 14:49:07 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl
Tags: upstream-0.1.4+14.04.20140204
Import upstream version 0.1.4+14.04.20140204

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp
56
56
            {
57
57
                if (conf_output.connected && conf_output.modes.size() > 0)
58
58
                {
59
 
                    conf.configure_output(conf_output.id, true, geom::Point{0, 0},
60
 
                                          conf_output.preferred_mode_index, mir_power_mode_on);
 
59
                    conf.configure_output(conf_output.id, true,
 
60
                                          geom::Point{0, 0},
 
61
                                          conf_output.preferred_mode_index,
 
62
                                          conf_output.current_format,
 
63
                                          mir_power_mode_on,
 
64
                                          conf_output.orientation);
61
65
                }
62
66
                else
63
67
                {
64
 
                    conf.configure_output(conf_output.id, false, conf_output.top_left,
65
 
                                          conf_output.current_mode_index, mir_power_mode_on);
 
68
                    conf.configure_output(conf_output.id, false,
 
69
                                          conf_output.top_left,
 
70
                                          conf_output.current_mode_index,
 
71
                                          conf_output.current_format,
 
72
                                          mir_power_mode_on,
 
73
                                          conf_output.orientation);
66
74
                }
67
75
            });
68
76
    }
80
88
            {
81
89
                if (conf_output.connected && conf_output.modes.size() > 0)
82
90
                {
83
 
                    conf.configure_output(conf_output.id, true, geom::Point{max_x, 0},
84
 
                                          conf_output.preferred_mode_index, mir_power_mode_on);
 
91
                    conf.configure_output(conf_output.id, true,
 
92
                                          geom::Point{max_x, 0},
 
93
                                          conf_output.preferred_mode_index,
 
94
                                          conf_output.current_format,
 
95
                                          mir_power_mode_on,
 
96
                                          conf_output.orientation);
85
97
                    max_x += conf_output.modes[conf_output.preferred_mode_index].size.width.as_int();
86
98
                }
87
99
                else
88
100
                {
89
 
                    conf.configure_output(conf_output.id, false, conf_output.top_left,
90
 
                                          conf_output.current_mode_index, mir_power_mode_on);
 
101
                    conf.configure_output(conf_output.id, false,
 
102
                                          conf_output.top_left,
 
103
                                          conf_output.current_mode_index,
 
104
                                          conf_output.current_format,
 
105
                                          mir_power_mode_on,
 
106
                                          conf_output.orientation);
91
107
                }
92
108
            });
93
109
    }
472
488
        [&](mg::DisplayConfigurationOutput const& conf_output)
473
489
        {
474
490
            conf->configure_output(conf_output.id, false, conf_output.top_left,
475
 
                                   conf_output.preferred_mode_index, mir_power_mode_on);
 
491
                                   conf_output.preferred_mode_index,
 
492
                                   mir_pixel_format_xrgb_8888,
 
493
                                   mir_power_mode_on,
 
494
                                   conf_output.orientation);
476
495
        });
477
496
 
478
497
    display->configure(*conf);
508
527
        [&](mg::DisplayConfigurationOutput const& conf_output)
509
528
        {
510
529
            conf->configure_output(conf_output.id, false, conf_output.top_left,
511
 
                                   conf_output.preferred_mode_index, mir_power_mode_on);
 
530
                                   conf_output.preferred_mode_index,
 
531
                                   mir_pixel_format_xrgb_8888,
 
532
                                   mir_power_mode_on, conf_output.orientation);
512
533
        });
513
534
 
514
535
    display->configure(*conf);