diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-26 12:09:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:09:28 +0000 |
| commit | 3c96a2b8fe4b52a8617e84c8aced43326d964f55 (patch) | |
| tree | f3610b41eb7fc0f7edf8afb2f74a14cc71dba7c0 | |
| parent | 6a2acff8c195b5b03ac022e7deb157cca06dadb6 (diff) | |
| parent | 1fb141f83bad3884e2199c7acdc23932afaefe0c (diff) | |
| download | frameworks_base-3c96a2b8fe4b52a8617e84c8aced43326d964f55.zip frameworks_base-3c96a2b8fe4b52a8617e84c8aced43326d964f55.tar.gz frameworks_base-3c96a2b8fe4b52a8617e84c8aced43326d964f55.tar.bz2 | |
am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
Improve DisplayList state output
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 7 | ||||
| -rw-r--r-- | libs/hwui/RenderProperties.h | 2 | ||||
| -rw-r--r-- | libs/hwui/tests/Android.mk | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 07d4f63..9812fb1 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -106,8 +106,11 @@ 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, render=%d)", (level - 1) * 2, "", this, - getName(), isRenderable()); + ALOGD("%*sStart display list (%p, %s%s%s%s)", (level - 1) * 2, "", this, + getName(), + (properties().hasShadow() ? ", casting shadow" : ""), + (isRenderable() ? "" : ", empty"), + (mLayer != NULL ? ", on HW Layer" : "")); ALOGD("%*s%s %d", level * 2, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag); diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h index 2b5b811..be43e60 100644 --- a/libs/hwui/RenderProperties.h +++ b/libs/hwui/RenderProperties.h @@ -570,7 +570,7 @@ public: } bool hasShadow() const { - return getZ() >= 0.0f + return getZ() > 0.0f && getOutline().getPath() != NULL && getOutline().getAlpha() != 0.0f; } diff --git a/libs/hwui/tests/Android.mk b/libs/hwui/tests/Android.mk index b3ce414..14739af 100644 --- a/libs/hwui/tests/Android.mk +++ b/libs/hwui/tests/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES +LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\" LOCAL_CFLAGS += -Wno-unused-parameter |