Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve DisplayList state output" into lmp-mr1-dev

Browse Source
This commit is contained in:
Chris Craik
2014-11-25 18:45:10 +00:00
committed by Android (Google) Code Review
parent d0f6b4f629 b5a5435a77
commit ee6606519d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/RenderNode.cpp
View File

@@ -105,8 +105,11 @@ void RenderNode::setStagingDisplayList(DisplayListData* data) {
* display list. This function should remain in sync with the replay() function. * display list. This function should remain in sync with the replay() function.
*/ */
void RenderNode::output(uint32_t level) { void RenderNode::output(uint32_t level) {
ALOGD("%*sStart display list (%p, %s, render=%d)", (level - 1) * 2, "", this, ALOGD("%*sStart display list (%p, %s%s%s%s)", (level - 1) * 2, "", this,
getName(), isRenderable()); getName(),
(properties().hasShadow() ? ", casting shadow" : ""),
(isRenderable() ? "" : ", empty"),
(mLayer != NULL ? ", on HW Layer" : ""));
ALOGD("%*s%s %d", level * 2, "", "Save", ALOGD("%*s%s %d", level * 2, "", "Save",
SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag); SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

2
libs/hwui/RenderProperties.h
View File

@@ -570,7 +570,7 @@ public:
} }
bool hasShadow() const { bool hasShadow() const {
return getZ() >= 0.0f return getZ() > 0.0f
&& getOutline().getPath() != NULL && getOutline().getPath() != NULL
&& getOutline().getAlpha() != 0.0f; && getOutline().getAlpha() != 0.0f;
} }

1
libs/hwui/tests/Android.mk
View File

@@ -19,6 +19,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES 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 += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \