Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79d3c59c authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am ed0f7cba: Merge "Fix view z translation with 3d projection disabled" 

* commit 'ed0f7cba':
  Fix view z translation with 3d projection disabled
parents 22d1ac9e ed0f7cba

libs/hwui/DisplayList.cpp

+9 −4
Original line number Diff line number Diff line
@@ -418,11 +418,16 @@ void DisplayList::setViewProperties(OpenGLRenderer& renderer, T& handler, 
        renderer.concatMatrix(mAnimationMatrix);

    }

    if (mMatrixFlags != 0) {

        if (Caches::getInstance().propertyEnable3d) {

            if (mMatrixFlags == TRANSLATION) {

                renderer.translate(mTranslationX, mTranslationY, mTranslationZ);

            } else {

            if (Caches::getInstance().propertyEnable3d) {

                renderer.concatMatrix(mTransform);

            }

        } else {

            // avoid setting translationZ, use SkMatrix

            if (mMatrixFlags == TRANSLATION) {

                renderer.translate(mTranslationX, mTranslationY, 0);

            } else {

                renderer.concatMatrix(mTransformMatrix);

            }