Merge "Fix view z translation with 3d projection disabled" (ed0f7cba) · Commits · e / os / android_frameworks_base

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);
		}