diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-25 18:45:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-25 18:45:11 +0000 |
| commit | ee6606519d22805c1caf23a3c75cde9fc97b34eb (patch) | |
| tree | 923b1bdc3095cacfb77cc3d0b3ea0e29c24acc90 /libs | |
| parent | d0f6b4f6297373e569e383edc21aaa3f87591e0b (diff) | |
| parent | b5a5435a77bae40b55053ccde93b1ed45d0e8329 (diff) | |
| download | frameworks_base-ee6606519d22805c1caf23a3c75cde9fc97b34eb.zip frameworks_base-ee6606519d22805c1caf23a3c75cde9fc97b34eb.tar.gz frameworks_base-ee6606519d22805c1caf23a3c75cde9fc97b34eb.tar.bz2 | |
Merge "Improve DisplayList state output" into lmp-mr1-dev
Diffstat (limited to 'libs')
| -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 eb0948f..bbba2dd 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -105,8 +105,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 b936d4b..31c4f22 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 9622073..7bdce7f 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_SRC_FILES:= \ |