diff options
| author | Romain Guy <romainguy@google.com> | 2013-09-12 21:37:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 21:37:32 -0700 |
| commit | 0885b291650c1b85220645943c9eab3080170aca (patch) | |
| tree | fb636b6129255209c38d9f24955b1ef1f60da516 /libs | |
| parent | cf76be7195fc42ac6d72cb2d38309894fff4d368 (diff) | |
| parent | 4801a4f90710427f71b717c6869a63113846689a (diff) | |
| download | frameworks_base-0885b291650c1b85220645943c9eab3080170aca.zip frameworks_base-0885b291650c1b85220645943c9eab3080170aca.tar.gz frameworks_base-0885b291650c1b85220645943c9eab3080170aca.tar.bz2 | |
am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev
* commit '4801a4f90710427f71b717c6869a63113846689a':
Always disable the clip for layers Bug #8149344
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index 0d7b37d..bb6526e 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -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 { |