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

Merge "Always disable the clip for layers Bug #8149344" into klp-dev

Browse Source
This commit is contained in:
Romain Guy
2013-09-13 01:18:30 +00:00
committed by Android (Google) Code Review
parent 95a6560f63 1de466fc91
commit 4801a4f907
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/DisplayList.cpp
View File

@@ -369,11 +369,10 @@ void DisplayList::outputViewProperties(const int level) {
}
}
bool clipToBoundsNeeded = mClipToBounds;
bool clipToBoundsNeeded = mCaching ? false : mClipToBounds;
if (mAlpha < 1) {
if (mCaching) {
ALOGD("%*sSetOverrideLayerAlpha %.2f", level * 2, "", mAlpha);
clipToBoundsNeeded = false; // clipping done by layer
} else if (!mHasOverlappingRendering) {
ALOGD("%*sScaleAlpha %.2f", level * 2, "", mAlpha);
} else {
@@ -422,11 +421,10 @@ void DisplayList::setViewProperties(OpenGLRenderer& renderer, T& handler,
renderer.concatMatrix(mTransformMatrix);
}
}
bool clipToBoundsNeeded = mClipToBounds;
bool clipToBoundsNeeded = mCaching ? false : mClipToBounds;
if (mAlpha < 1) {
if (mCaching) {
renderer.setOverrideLayerAlpha(mAlpha);
clipToBoundsNeeded = false; // clipping done by layer
} else if (!mHasOverlappingRendering) {
renderer.scaleAlpha(mAlpha);
} else {