Mir

Merge lp://qastaging/~kdub/mir/fix-1485070 into lp://qastaging/mir

  1. fix-1485070
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Merged at revision: 2848
Proposed branch: lp://qastaging/~kdub/mir/fix-1485070
Merge into: lp://qastaging/mir
Diff against target: 37 lines (+18/-1)
2 files modified
src/platforms/android/server/display_buffer.cpp (+3/-1)
tests/unit-tests/graphics/android/test_display_buffer.cpp (+15/-0)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/fix-1485070
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+268124@code.qastaging.launchpad.net

Commit message

android: reject overlay optimization if DisplayBuffer is rotated.

fixes lp: #1485070

Description of the change

android: reject overlay optimization if DisplayBuffer is rotated.

fixes lp: #1485070

HWC is able to handle this, but a bit more work is needed (https://trello.com/c/G1dPmg12). For now just reject the optimization.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2847
http://jenkins.qa.ubuntu.com/job/mir-ci/4579/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3543
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1076/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3491
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/728/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3491
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3491/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6269
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22596

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4579/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Seems to be consistent with the Mesa implementation now.

I always confuse myself with the function naming. Although the inline documentation explains it, the function name DisplayBuffer::orientation() does little to explain the intended semantics...

    /** Returns the orientation of the display buffer relative to how the
     * user should see it (the orientation of the output).
     * This tells us how much (if any) rotation the renderer needs to do.
     * If your DisplayBuffer can do the rotation itself then this will
     * always return mir_orientation_normal. If the DisplayBuffer does not
     * implement the rotation itself then this function will return the
     * amount of rotation the renderer must do to make things "look right".
     */
    virtual MirOrientation orientation() const = 0;

My fault.

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