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

am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev

Browse Source 
* commit '4801a4f90710427f71b717c6869a63113846689a':
  Always disable the clip for layers Bug #8149344
This commit is contained in:
Romain Guy
2013-09-12 21:37:32 -07:00
committed by Android Git Automerger
parent cf76be7195 4801a4f907
commit 0885b29165
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 (mAlpha < 1) {
if (mCaching) { if (mCaching) {
ALOGD("%*sSetOverrideLayerAlpha %.2f", level * 2, "", mAlpha); ALOGD("%*sSetOverrideLayerAlpha %.2f", level * 2, "", mAlpha);
clipToBoundsNeeded = false; // clipping done by layer
} else if (!mHasOverlappingRendering) { } else if (!mHasOverlappingRendering) {
ALOGD("%*sScaleAlpha %.2f", level * 2, "", mAlpha); ALOGD("%*sScaleAlpha %.2f", level * 2, "", mAlpha);
} else { } else {
@@ -422,11 +421,10 @@ void DisplayList::setViewProperties(OpenGLRenderer& renderer, T& handler,
renderer.concatMatrix(mTransformMatrix); renderer.concatMatrix(mTransformMatrix);
} }
} }
bool clipToBoundsNeeded = mClipToBounds; bool clipToBoundsNeeded = mCaching ? false : mClipToBounds;
if (mAlpha < 1) { if (mAlpha < 1) {
if (mCaching) { if (mCaching) {
renderer.setOverrideLayerAlpha(mAlpha); renderer.setOverrideLayerAlpha(mAlpha);
clipToBoundsNeeded = false; // clipping done by layer
} else if (!mHasOverlappingRendering) { } else if (!mHasOverlappingRendering) {
renderer.scaleAlpha(mAlpha); renderer.scaleAlpha(mAlpha);
} else { } else {