diff options
| author | Romain Guy <romainguy@google.com> | 2013-09-12 16:09:19 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2013-09-12 23:13:38 +0000 |
| commit | 1de466fc91511de8428affcf1eb71dc6af946145 (patch) | |
| tree | f3f175819331a48534b19a68331abd189fb76708 | |
| parent | 25f17f295b4da464a2758c11a02cabb51bf4722f (diff) | |
| download | frameworks_base-1de466fc91511de8428affcf1eb71dc6af946145.zip frameworks_base-1de466fc91511de8428affcf1eb71dc6af946145.tar.gz frameworks_base-1de466fc91511de8428affcf1eb71dc6af946145.tar.bz2 | |
Always disable the clip for layers
Bug #8149344
Change-Id: Ifd413cadb171232eb846b3d91b05b2d2457b9f35
| -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 { |