Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee660651 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

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

parents d0f6b4f6 b5a5435a

libs/hwui/RenderNode.cpp

+5 −2
Original line number Diff line number Diff line
@@ -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);

libs/hwui/RenderProperties.h

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ public: 
    }



    bool hasShadow() const {

        return getZ() >= 0.0f

        return getZ() > 0.0f

                && getOutline().getPath() != NULL

                && getOutline().getAlpha() != 0.0f;

    }

libs/hwui/tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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:= \