diff options
| author | Romain Guy <romainguy@google.com> | 2013-09-12 21:42:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 21:42:25 -0700 |
| commit | b1c53942f1422453093943eed04bb8720f05ddb4 (patch) | |
| tree | e9e8dc2de6c78c7bb8ee98148c9ed0bdce319c1c /libs | |
| parent | 156ba58f9b53d347808dcc5e75b2c7afd14bfe38 (diff) | |
| parent | 0885b291650c1b85220645943c9eab3080170aca (diff) | |
| download | frameworks_base-b1c53942f1422453093943eed04bb8720f05ddb4.zip frameworks_base-b1c53942f1422453093943eed04bb8720f05ddb4.tar.gz frameworks_base-b1c53942f1422453093943eed04bb8720f05ddb4.tar.bz2 | |
am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev
* commit '0885b291650c1b85220645943c9eab3080170aca':
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 { |