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

Commit cf8d9d4a authored by Chris Craik's avatar Chris Craik
Browse files

Fix view z translation with 3d projection disabled 

The ortho projection can't handle 3d translation, so skip that step if
perspective projection isn't enabled.

Change-Id: I231e6bcecc82e876b697e098e034f0fd3b06efde
parent c46809e9

libs/hwui/DisplayList.cpp

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

        renderer.concatMatrix(mAnimationMatrix);

    }

    }

    if (mMatrixFlags != 0) {

    if (mMatrixFlags != 0) {

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

            if (mMatrixFlags == TRANSLATION) {

            if (mMatrixFlags == TRANSLATION) {

                renderer.translate(mTranslationX, mTranslationY, mTranslationZ);

                renderer.translate(mTranslationX, mTranslationY, mTranslationZ);

            } else {

            } else {

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

                renderer.concatMatrix(mTransform);

                renderer.concatMatrix(mTransform);

            }

        } else {

            // avoid setting translationZ, use SkMatrix

            if (mMatrixFlags == TRANSLATION) {

                renderer.translate(mTranslationX, mTranslationY, 0);

            } else {

            } else {

                renderer.concatMatrix(mTransformMatrix);

                renderer.concatMatrix(mTransformMatrix);

            }

            }