diff options
| author | 2013-05-23 11:28:05 -0700 | |
|---|---|---|
| committer | 2013-05-23 11:28:05 -0700 | |
| commit | 341ac60009e6b3c1114938f40743fd81a0ce034f (patch) | |
| tree | 6b6360a0c3a3a6891de54801815195abfc04c905 | |
| parent | 664ed997a2887e4f462d99e731c5c9c0b0e41f2c (diff) | |
| parent | 1bf58a5a4c3275a8de676046da311ec0c3c61c78 (diff) | |
am 1bf58a5a: am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
* commit '1bf58a5a4c3275a8de676046da311ec0c3c61c78':
Restore previous alpha value on noop'd DisplayList operations
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index d4512a719792..06209f122053 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -501,8 +501,10 @@ void DisplayList::iterate(OpenGLRenderer& renderer, T& handler, const int level) setViewProperties<T>(renderer, handler, level + 1); if (mClipToBounds && renderer.quickRejectNoScissor(0, 0, mWidth, mHeight)) { - DISPLAY_LIST_LOGD("%*sRestoreToCount %d", level * 2, "", restoreTo); + DISPLAY_LIST_LOGD("%*sRestoreToCount %d", (level + 1) * 2, "", restoreTo); handler(mRestoreToCountOp->reinit(restoreTo), PROPERTY_SAVECOUNT, mClipToBounds); + renderer.restoreToCount(restoreTo); + renderer.setOverrideLayerAlpha(1.0f); return; } |