← Back to branch summary

~kgunn72/mir/mir-mwc-ppa-disable-tests

« back to all changes in this revision

Viewing changes to src/platforms/android/server/hal_component_factory.cpp

  • Committer: Tarmac
  • Author(s): Kevin DuBois
  • Date: 2015-01-29 16:35:31 UTC
  • mfrom: (2215.3.26 pull-list-from-device)
  • Revision ID: tarmac-20150129163531-oklyqevk921mxuq3
android: pull the mga::LayerList instance from the mga::HwcDevice to the mga::DisplayBuffer.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/android/server/hal_component_factory.cpp
72
72
        attribs.vrefresh_hz, attribs.num_framebuffers));
73
73
}
74
74
 
 
75
std::unique_ptr<mga::LayerList> mga::HalComponentFactory::create_layer_list()
 
76
{
 
77
    if (force_backup_display)
 
78
        return std::unique_ptr<mga::LayerList>(new mga::LayerList(std::make_shared<mga::Hwc10Adapter>(), {}));
 
79
    switch (hwc_version)
 
80
    {
 
81
        case mga::HwcVersion::hwc10:
 
82
            return std::unique_ptr<mga::LayerList>(new mga::LayerList(std::make_shared<mga::Hwc10Adapter>(), {}));
 
83
        case mga::HwcVersion::hwc11:
 
84
        case mga::HwcVersion::hwc12:
 
85
            return std::unique_ptr<mga::LayerList>(new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}));
 
86
        case mga::HwcVersion::hwc13:
 
87
            return std::unique_ptr<mga::LayerList>(new mga::LayerList(std::make_shared<mga::FloatSourceCrop>(), {}));
 
88
        case mga::HwcVersion::hwc14:
 
89
        case mga::HwcVersion::unknown:
 
90
        default:
 
91
            BOOST_THROW_EXCEPTION(std::runtime_error("unknown or unsupported hwc version"));
 
92
    }
 
93
}
 
94
 
75
95
std::unique_ptr<mga::DisplayDevice> mga::HalComponentFactory::create_display_device()
76
96
{
77
97
    if (force_backup_display)
91
111
 
92
112
            case mga::HwcVersion::hwc11:
93
113
            case mga::HwcVersion::hwc12:
94
 
               return std::unique_ptr<mga::DisplayDevice>(
95
 
                    new mga::HwcDevice(
96
 
                        hwc_wrapper,
97
 
                        std::make_shared<mga::IntegerSourceCrop>()));
98
 
            break;
99
 
 
100
114
            case mga::HwcVersion::hwc13:
101
115
               return std::unique_ptr<mga::DisplayDevice>(
102
 
                    new mga::HwcDevice(
103
 
                        hwc_wrapper,
104
 
                        std::make_shared<mga::FloatSourceCrop>()));
 
116
                    new mga::HwcDevice(hwc_wrapper));
105
117
            break;
106
 
 
107
118
            case mga::HwcVersion::hwc14:
108
119
            case mga::HwcVersion::unknown:
109
120
            default: