diff options
| author | Romain Guy <romainguy@google.com> | 2013-09-13 01:18:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 01:18:31 +0000 |
| commit | 4801a4f90710427f71b717c6869a63113846689a (patch) | |
| tree | 3da87f09170c0b1ae6b1807909e687bbe850ff9e | |
| parent | 95a6560f63563aeb36a56fb0384685a2f925d3c1 (diff) | |
| parent | 1de466fc91511de8428affcf1eb71dc6af946145 (diff) | |
| download | frameworks_base-4801a4f90710427f71b717c6869a63113846689a.zip frameworks_base-4801a4f90710427f71b717c6869a63113846689a.tar.gz frameworks_base-4801a4f90710427f71b717c6869a63113846689a.tar.bz2 | |
Merge "Always disable the clip for layers Bug #8149344" into klp-dev
| -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 { |