Mir

Merge lp://qastaging/~kdub/mir/hwc-alpha-support into lp://qastaging/mir

Proposed by Kevin DuBois
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 1708
Proposed branch: lp://qastaging/~kdub/mir/hwc-alpha-support
Merge into: lp://qastaging/mir
Diff against target: 357 lines (+85/-21)
11 files modified
debian/control (+1/-1)
include/test/mir_test_doubles/stub_renderable.h (+12/-0)
src/platform/graphics/android/hwc_device.cpp (+14/-4)
src/platform/graphics/android/hwc_fallback_gl_renderer.cpp (+6/-1)
src/platform/graphics/android/hwc_layers.cpp (+12/-1)
tests/unit-tests/graphics/android/hwc_struct_helpers.cpp (+1/-0)
tests/unit-tests/graphics/android/hwc_struct_helpers.h (+1/-0)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+10/-6)
tests/unit-tests/graphics/android/test_hwc_fallback_gl_renderer.cpp (+24/-7)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+1/-0)
tests/unit-tests/graphics/android/test_hwc_layers.cpp (+3/-1)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/hwc-alpha-support
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
Alan Griffiths Approve
Chris Halse Rogers Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+223617@code.qastaging.launchpad.net

Commit message

android: support alpha blending overlays together in HWC. bumps android-headers version requirement from 4.2.2 to 4.4.2. also change to premultiplied blending in hwc by default, as thats more in line with the rest of the system.

lp: #1329879

Description of the change

android: support alpha blending overlays together in HWC. bumps android-headers version requirement from 4.2.2 to 4.4.2. also change to premultiplied blending in hwc by default, as thats more in line with the rest of the system.

lp: #1329879

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

LGTM

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Nit:

30 + return 1.0f - ( 3.0f / 1024.0f );

"Parentheses should have no spaces inside them."

http://unity.ubuntu.com/mir/cppguide/index.html?showone=Horizontal_Whitespace#Horizontal_Whitespace

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches