Mir

Merge lp:~kdub/mir/missing-hwc15-case-statements-0.22 into lp:mir/ubuntu

  1. missing-hwc15-case-statements-0.22
  2. Merge into ubuntu
Proposed by Kevin DuBois
Status: Work in progress
Proposed branch: lp:~kdub/mir/missing-hwc15-case-statements-0.22
Merge into: lp:mir/ubuntu
Diff against target: 32 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
src/platforms/android/server/hal_component_factory.cpp (+2/-0)
To merge this branch: bzr merge lp:~kdub/mir/missing-hwc15-case-statements-0.22
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+295112@code.launchpad.net

Commit message

Support branch to unblock PES bringup. Do not land, fixes will go into 0.23.1.

Description of the change

Support branch to unblock PES bringup. Do not land, fixes will go into 0.23.1.

To post a comment you must log in.

Unmerged revisions

1277. By Kevin DuBois

fix hwc 1.5 construction

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-05-16 15:36:50 +0000
3+++ debian/changelog 2016-05-18 17:36:59 +0000
4@@ -1,3 +1,9 @@
5+mir (0.22.1+16.04.20160516.2-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * fix HWC 1.5 construction (LP: 1583086)
8+
9+ -- Kevin DuBois <kevin.dubois@canonical.com> Wed, 18 May 2016 13:34:28 -0400
10+
11 mir (0.22.1+16.04.20160516.2-0ubuntu1) xenial; urgency=medium
12
13 [ Andreas Pokorny ]
14
15=== modified file 'src/platforms/android/server/hal_component_factory.cpp'
16--- src/platforms/android/server/hal_component_factory.cpp 2016-04-21 17:36:10 +0000
17+++ src/platforms/android/server/hal_component_factory.cpp 2016-05-18 17:36:59 +0000
18@@ -117,6 +117,7 @@
19 new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}, offset));
20 case mga::HwcVersion::hwc13:
21 case mga::HwcVersion::hwc14:
22+ case mga::HwcVersion::hwc15:
23 return std::unique_ptr<mga::LayerList>(
24 new mga::LayerList(std::make_shared<mga::FloatSourceCrop>(), {}, offset));
25 case mga::HwcVersion::unknown:
26@@ -145,6 +146,7 @@
27 case mga::HwcVersion::hwc12:
28 case mga::HwcVersion::hwc13:
29 case mga::HwcVersion::hwc14:
30+ case mga::HwcVersion::hwc15:
31 return std::unique_ptr<mga::DisplayDevice>(
32 new mga::HwcDevice(hwc_wrapper));
33

Subscribers

People subscribed via source and target branches