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

Commit 505d1d64 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Prettify display lists logging"

parents ec39a94a 7031ff68

libs/hwui/DisplayList.cpp

+5 −3
Original line number Diff line number Diff line
@@ -251,16 +251,18 @@ size_t DisplayList::getSize() { 
 * display list. This function should remain in sync with the replay() function.

 */

void DisplayList::output(uint32_t level) {

    ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this,

    ALOGD("%*sStart display list (%p, %s, render=%d)", (level - 1) * 2, "", this,

            mName.string(), isRenderable());

    ALOGD("%*s%s %d", level * 2, "", "Save",

            SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);



    ALOGD("%*s%s %d", level * 2, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    outputViewProperties(level);

    int flags = DisplayListOp::kOpLogFlag_Recurse;

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

        mDisplayListData->displayListOps[i]->output(level, flags);

    }

    ALOGD("%*sDone (%p, %s)", level * 2, "", this, mName.string());



    ALOGD("%*sDone (%p, %s)", (level - 1) * 2, "", this, mName.string());

}



float DisplayList::getPivotX() {

libs/hwui/DisplayList.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
#ifndef ANDROID_HWUI_DISPLAY_LIST_H

#define ANDROID_HWUI_DISPLAY_LIST_H



#ifndef LOG_TAG

    #define LOG_TAG "OpenGLRenderer"

#endif



#include <SkCamera.h>

#include <SkMatrix.h>

libs/hwui/DisplayListOp.h

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@ 
#ifndef ANDROID_HWUI_DISPLAY_OPERATION_H

#define ANDROID_HWUI_DISPLAY_OPERATION_H



#ifndef LOG_TAG

    #define LOG_TAG "OpenGLRenderer"

#endif



#include <SkXfermode.h>



#include <private/hwui/DrawGlInfo.h>

libs/hwui/OpenGLRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1807,7 +1807,7 @@ status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, 


void OpenGLRenderer::outputDisplayList(DisplayList* displayList) {

    if (displayList) {

        displayList->output(0);

        displayList->output(1);

    }

}