Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix view z translation with 3d projection disabled"

Browse Source
This commit is contained in:
Chris Craik
2014-01-17 02:07:45 +00:00
committed by Android (Google) Code Review
parent ca10d38aef cf8d9d4af3
commit ed0f7cba53
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/hwui/DisplayList.cpp
View File

@@ -418,11 +418,16 @@ void DisplayList::setViewProperties(OpenGLRenderer& renderer, T& handler,
renderer.concatMatrix(mAnimationMatrix);
}
if (mMatrixFlags != 0) {
if (mMatrixFlags == TRANSLATION) {
renderer.translate(mTranslationX, mTranslationY, mTranslationZ);
} else {
if (Caches::getInstance().propertyEnable3d) {
if (Caches::getInstance().propertyEnable3d) {
if (mMatrixFlags == TRANSLATION) {
renderer.translate(mTranslationX, mTranslationY, mTranslationZ);
} else {
renderer.concatMatrix(mTransform);
}
} else {
// avoid setting translationZ, use SkMatrix
if (mMatrixFlags == TRANSLATION) {
renderer.translate(mTranslationX, mTranslationY, 0);
} else {
renderer.concatMatrix(mTransformMatrix);
}