diff options
| author | Chris Craik <ccraik@google.com> | 2015-05-27 19:22:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-27 19:22:59 +0000 |
| commit | 1ec5e308a913cd0c54d58fd797274485664781c1 (patch) | |
| tree | b9b847b1b65f8be348b882d15a837b6f890d71b6 /libs | |
| parent | 1e6d566c5f8500e3639a8f8ceebf0226c07efc13 (diff) | |
| parent | 43a1d31a2837406a437937b340db85c1a05ed1ed (diff) | |
| download | frameworks_base-1ec5e308a913cd0c54d58fd797274485664781c1.zip frameworks_base-1ec5e308a913cd0c54d58fd797274485664781c1.tar.gz frameworks_base-1ec5e308a913cd0c54d58fd797274485664781c1.tar.bz2 | |
Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 3 | ||||
| -rw-r--r-- | libs/hwui/RenderProperties.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 9146b68..9e5ec28 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -83,8 +83,9 @@ void RenderNode::setStagingDisplayList(DisplayListData* data) { * display list. This function should remain in sync with the replay() function. */ void RenderNode::output(uint32_t level) { - ALOGD("%*sStart display list (%p, %s%s%s%s)", (level - 1) * 2, "", this, + ALOGD("%*sStart display list (%p, %s%s%s%s%s)", (level - 1) * 2, "", this, getName(), + (MathUtils::isZero(properties().getAlpha()) ? ", zero alpha" : ""), (properties().hasShadow() ? ", casting shadow" : ""), (isRenderable() ? "" : ", empty"), (mLayer != nullptr ? ", on HW Layer" : "")); diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp index 7b75690..07b8ce6 100644 --- a/libs/hwui/RenderProperties.cpp +++ b/libs/hwui/RenderProperties.cpp @@ -146,12 +146,12 @@ void RenderProperties::debugOutputProperties(const int level) const { const bool isLayer = effectiveLayerType() != LayerType::None; int clipFlags = getClippingFlags(); - if (mPrimitiveFields.mAlpha < 1) { + if (mPrimitiveFields.mAlpha < 1 + && !MathUtils::isZero(mPrimitiveFields.mAlpha)) { if (isLayer) { clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer } - LOG_ALWAYS_FATAL_IF(!isLayer && mPrimitiveFields.mHasOverlappingRendering); ALOGD("%*sScaleAlpha %.2f", level * 2, "", mPrimitiveFields.mAlpha); } if (clipFlags) { |